suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed both mac window zoom and root menu-bar, hopefully

Browse Source 
svn: r472
This commit is contained in:
Matthew Flatt 2005-07-28 04:35:57 +00:00
parent b97ed46ad1
commit ab098933be
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wxmac/src/mac/wx_app.cc
View File

@ -44,7 +44,7 @@ extern Bool doCallPreMouseEvent(wxWindow *in_win, wxWindow *win, wxMouseEvent *e
extern WindowPtr MrEdMouseWindow(Point where); extern WindowPtr MrEdMouseWindow(Point where);
extern WindowPtr MrEdKeyWindow(); extern WindowPtr MrEdKeyWindow();
extern void wxCheckRootFrame(Bool frame_present); extern void wxCheckRootFrame(WindowPtr w);
int wxMenuBarHeight; int wxMenuBarHeight;
@ -182,7 +182,7 @@ void wxApp::doMacPreEvent()
WindowPtr w; WindowPtr w;
w = FrontNonFloatingWindow(); w = FrontNonFloatingWindow();
wxCheckRootFrame(!!w); wxCheckRootFrame(w);
if (!w) { if (!w) {
/* Maybe we just showed the root frame: */ /* Maybe we just showed the root frame: */
w = FrontNonFloatingWindow(); w = FrontNonFloatingWindow();

29
src/wxmac/src/mac/wx_frame.cc
View File

@ -301,7 +301,7 @@ static OSStatus window_evt_handler(EventHandlerCallRef inHandlerCallRef,
GetEventParameter(inEvent, kEventParamAttributes, typeUInt32, GetEventParameter(inEvent, kEventParamAttributes, typeUInt32,
NULL, sizeof(a), NULL, &a); NULL, sizeof(a), NULL, &a);
if (a & kWindowBoundsChangeUserDrag) { if (a & kWindowBoundsChangeUserDrag) {
/* DragWindow is somehow broken. It seems to confuse the struct /* DragWindow is somehow confused by MrEd. It seems to confuse the struct
and content regions, causing current bounds's height to become and content regions, causing current bounds's height to become
different from the original bound's height. To compensate, different from the original bound's height. To compensate,
10.3 seems to ignore the hieght, but 10.4 doesn't. So we 10.3 seems to ignore the hieght, but 10.4 doesn't. So we
@ -328,7 +328,7 @@ static OSStatus window_evt_handler(EventHandlerCallRef inHandlerCallRef,
if (((c.bottom - c.top) == (s.bottom - s.top)) if (((c.bottom - c.top) == (s.bottom - s.top))
&& ((c.right - c.left) == (s.right - s.left))) { && ((c.right - c.left) == (s.right - s.left))) {
/* Struct size == content size? This is when the window /* Struct size == content size? This is when the window
manager is confused in 10.4. Subtract out the difference manager is confused by MrEd in 10.4. Subtract out the difference
between the real content and structure regions. */ between the real content and structure regions. */
int h, w, hdelta, wdelta; int h, w, hdelta, wdelta;
@ -615,6 +615,20 @@ void wxFrame::Maximize(Bool maximize)
::ZoomWindowIdeal(theMacWindow, maximize ? inZoomOut : inZoomIn, &size); ::ZoomWindowIdeal(theMacWindow, maximize ? inZoomOut : inZoomIn, &size);
if (maximize) {
/* MrEd somehow confuses Carbon about structure region versus content region.
Subtract out the difference. */
Rect r;
wxArea *parea;
wxMargin pam;
parea = PlatformArea();
pam = parea->Margin();
GetWindowIdealUserState(theMacWindow, &r);
r.right -= pam.Offset(wxHorizontal);
r.bottom -= pam.Offset(wxVertical);
SetWindowIdealUserState(theMacWindow, &r);
}
wxMacRecalcNewSize(); wxMacRecalcNewSize();
if (cStatusPanel) { if (cStatusPanel) {
@ -1005,16 +1019,17 @@ void wxFrame::SetTitle(char* title)
} }
} }
void wxCheckRootFrame(Bool frame_present) void wxCheckRootFrame(WindowPtr w)
{ {
if (frame_present) { if (w) {
/* Hide root frame, if any, in case it's shown */ /* Hide root frame, if any, in case it's shown */
if (wxRootFrame) { if (wxRootFrame) {
wxMacDC *dc; wxMacDC *dc;
WindowPtr theMacWindow; WindowPtr theMacWindow;
dc = wxRootFrame->MacDC(); dc = wxRootFrame->MacDC();
theMacWindow = GetWindowFromPort(dc->macGrafPort()); theMacWindow = GetWindowFromPort(dc->macGrafPort());
::HideWindow(theMacWindow); if (w != theMacWindow)
::HideWindow(theMacWindow);
} }
} else { } else {
/* If all frames are closed/minimized, it's time for the root window (if any) */ /* If all frames are closed/minimized, it's time for the root window (if any) */
@ -1124,7 +1139,7 @@ void wxFrame::Show(Bool show)
/* b/c may be optimized for hidden: */ /* b/c may be optimized for hidden: */
cMacDC->setCurrentUser(NULL); cMacDC->setCurrentUser(NULL);
wxCheckRootFrame(TRUE); wxCheckRootFrame(theMacWindow);
} else { } else {
if (cFocusWindow) { if (cFocusWindow) {
ReleaseFocus(); ReleaseFocus();
@ -1149,7 +1164,7 @@ void wxFrame::Show(Bool show)
::HideWindow(theMacWindow); ::HideWindow(theMacWindow);
} }
wxCheckRootFrame(FALSE); wxCheckRootFrame(NULL);
} }
} }