CWindowRect() and Office/2007 theme.

When my app exits, I write the window rect to the registry, and when it starts, I get that value in PreCreateWindow() and set the window locations, so that the app appears in the same location and size as where it was when it exited.  The problem is when I use the Office/2007 and black theme (from Vista.cjstyles), GetWindowRect() is a couple of pixels smaller than the window, so the window shrinks a little.  We noticed that the difference was 4 pixels, so we arbitrarily added 4 to the height, which I think is a hack.  Is there an XTP equivalent that will do the same thing, similar to GetSystemMetrics(SM_CXFRAME) or something?

Yes, we use version control - we use TFS, and our server is somewhere in the cloud in a level 3 server farm.  We just have some old school guys that pre-date version control (and Windows) who like to leave little remarks.  It's harmless (occasionally helpful) and not worth the 'religious' war I'd start if I tried to get them to change.  I prefer Araxis Merge and "View History" if, on that rare occasion, I need to see what changed version to version.   You can tell that it's an old-school guy from the question, though, because nobody else would just add an arbitrary number as a 'fix', either.