mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a memory leak in new quartz window frame sizes detection routine.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6389 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Fabien Costantini 2008-10-06 19:20:49 +00:00
parent aca18384b7
commit 2c2cc8592e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Fl_mac.cxx
View File

@ -1620,8 +1620,8 @@ void handleUpdateEvent( WindowPtr xid )
// Gets the border sizes and the titlebar size
static void get_window_frame_sizes(int &bx, int &by, int &bt) {
#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
HIRect contentRect = { {50,50}, {100,100} }; // a rect to stand in for the content rect of a real window
HIThemeWindowDrawInfo metrics= {0,
static HIRect contentRect = { {50,50}, {100,100} }; // a rect to stand in for the content rect of a real window
static HIThemeWindowDrawInfo metrics= {0,
kThemeStateActive, kThemeDocumentWindow,
kThemeWindowHasFullZoom + kThemeWindowHasCloseBox +
kThemeWindowHasCollapseBox + kThemeWindowHasTitleText,
@ -1641,7 +1641,7 @@ static void get_window_frame_sizes(int &bx, int &by, int &bt) {
bt = rect3.size.height;
bx = rect2.origin.x - rect1.origin.x;
by = rect2.origin.y - rect1.origin.y - bt;
// fprintf(stderr, "GetThemeWindowRegion succeeded bx=%d by=%d bt=%d\n", bx, by, bt);
// fprintf(stderr, "HIThemeGetWindowShape succeeded bx=%d by=%d bt=%d\n", bx, by, bt);
}
else
#endif // MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
@ -1649,12 +1649,12 @@ static void get_window_frame_sizes(int &bx, int &by, int &bt) {
// sets default dimensions
bx = by = 6;
bt = 22;
// fprintf(stderr, "GetThemeWindowRegion failed, bx=%d by=%d bt=%d\n", bx, by, bt);
// fprintf(stderr, "HIThemeGetWindowShape failed, bx=%d by=%d bt=%d\n", bx, by, bt);
}
#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
if (shape1) free((void*) shape1); // we must free HIThemeGetWindowShape() (copied) handles
if (shape2) free((void*) shape2);
if (shape3) free((void*) shape3);
CFRelease(shape1); // we must free HIThemeGetWindowShape() (copied) handles
CFRelease(shape2);
CFRelease(shape3);
#endif // MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
}