X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d120f8391920145647ec10e84629bc21fa9f1bb..2e1a688e3e9c6c265620e4f05d579077367e9fdb:/src/motif/frame.cpp diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp index db685c5cf1..f0ddb991e0 100644 --- a/src/motif/frame.cpp +++ b/src/motif/frame.cpp @@ -51,9 +51,9 @@ #include "wx/motif/private.h" void wxCloseFrameCallback(Widget, XtPointer, XmAnyCallbackStruct *cbs); -void wxFrameFocusProc(Widget workArea, XtPointer clientData, +void wxFrameFocusProc(Widget workArea, XtPointer clientData, XmAnyCallbackStruct *cbs); -static void wxFrameMapProc(Widget frameShell, XtPointer clientData, +static void wxFrameMapProc(Widget frameShell, XtPointer clientData, XCrossingEvent * event); extern wxList wxModelessWindows; @@ -65,12 +65,12 @@ static bool wxTopLevelUsed = FALSE; #if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxFrame, wxWindow) -EVT_SIZE(wxFrame::OnSize) -EVT_ACTIVATE(wxFrame::OnActivate) -EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight) -EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) -EVT_IDLE(wxFrame::OnIdle) -EVT_CLOSE(wxFrame::OnCloseWindow) + EVT_SIZE(wxFrame::OnSize) + EVT_ACTIVATE(wxFrame::OnActivate) + EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight) + EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) + EVT_IDLE(wxFrame::OnIdle) + EVT_CLOSE(wxFrame::OnCloseWindow) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) @@ -84,13 +84,16 @@ bool wxFrame::m_useNativeStatusBar = FALSE; wxFrame::wxFrame() { +#if wxUSE_TOOLBAR m_frameToolBar = NULL ; +#endif // wxUSE_TOOLBAR + m_frameMenuBar = NULL; m_frameStatusBar = NULL; - - m_windowParent = NULL; + + m_parent = NULL; m_iconized = FALSE; - + //// Motif-specific m_frameShell = (WXWidget) NULL; m_frameWidget = (WXWidget) NULL;; @@ -110,14 +113,16 @@ bool wxFrame::Create(wxWindow *parent, { if (!parent) wxTopLevelWindows.Append(this); - + SetName(name); - + m_windowStyle = style; m_frameMenuBar = NULL; +#if wxUSE_TOOLBAR m_frameToolBar = NULL ; +#endif // wxUSE_TOOLBAR m_frameStatusBar = NULL; - + //// Motif-specific m_frameShell = (WXWidget) NULL; m_frameWidget = (WXWidget) NULL;; @@ -125,55 +130,89 @@ bool wxFrame::Create(wxWindow *parent, m_clientArea = (WXWidget) NULL;; m_visibleStatus = TRUE; m_title = ""; - + m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE); m_foregroundColour = *wxBLACK; - m_windowFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT); - + m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT); + if ( id > -1 ) m_windowId = id; else m_windowId = (int)NewControlId(); - + if (parent) parent->AddChild(this); - + wxModelessWindows.Append(this); - - int x = pos.x; int y = pos.y; - int width = size.x; int height = size.y; - + + int x = pos.x, y = pos.y; + int width = size.x, height = size.y; + + // Set reasonable values for position and size if defaults have been + // requested + // + // MB TODO: something better than these arbitrary values ? + // VZ should use X resources for this... + if ( width == -1 ) + width = 400; + if ( height == -1 ) + height = 400; + + int displayW, displayH; + wxDisplaySize( &displayW, &displayH ); + + if ( x == -1 ) + { + x = (displayW - width) / 2; + if (x < 10) x = 10; + } + if ( y == -1 ) + { + y = (displayH - height) / 2; + if (y < 10) y = 10; + } + if (wxTopLevelUsed) + { // Change suggested by Matthew Flatt - m_frameShell = (WXWidget) XtAppCreateShell(name, wxTheApp->GetClassName(), topLevelShellWidgetClass, (Display*) wxGetDisplay(), NULL, 0); + m_frameShell = (WXWidget)XtAppCreateShell + ( + name, + wxTheApp->GetClassName(), + topLevelShellWidgetClass, + (Display*) wxGetDisplay(), + NULL, + 0 + ); + } else { m_frameShell = wxTheApp->GetTopLevelWidget(); wxTopLevelUsed = TRUE; } - - XtVaSetValues((Widget) m_frameShell, + + XtVaSetValues((Widget) m_frameShell, // Allows menu to resize XmNallowShellResize, True, XmNdeleteResponse, XmDO_NOTHING, XmNmappedWhenManaged, False, XmNiconic, (style & wxICONIZE) ? TRUE : FALSE, NULL); - + if (!title.IsNull()) - XtVaSetValues((Widget) m_frameShell, + XtVaSetValues((Widget) m_frameShell, XmNtitle, (const char*) title, NULL); - + m_frameWidget = (WXWidget) XtVaCreateManagedWidget("main_window", xmMainWindowWidgetClass, (Widget) m_frameShell, XmNresizePolicy, XmRESIZE_NONE, NULL); - + m_workArea = (WXWidget) XtVaCreateWidget("form", xmFormWidgetClass, (Widget) m_frameWidget, XmNresizePolicy, XmRESIZE_NONE, NULL); - + m_clientArea = (WXWidget) XtVaCreateWidget("client", xmBulletinBoardWidgetClass, (Widget) m_workArea, XmNmarginWidth, 0, @@ -184,34 +223,37 @@ bool wxFrame::Create(wxWindow *parent, XmNbottomAttachment, XmATTACH_FORM, // XmNresizePolicy, XmRESIZE_ANY, NULL); - + + wxLogDebug("Created frame (0x%08x) with work area 0x%08x and client " + "area 0x%08x", m_frameWidget, m_workArea, m_clientArea); + + XtAddEventHandler((Widget) m_clientArea, ExposureMask,FALSE, + wxUniversalRepaintProc, (XtPointer) this); + XtVaSetValues((Widget) m_frameWidget, XmNworkWindow, (Widget) m_workArea, NULL); - - + XtManageChild((Widget) m_clientArea); XtManageChild((Widget) m_workArea); - - wxASSERT_MSG ((wxWidgetHashTable->Get((long)m_workArea) == (wxObject*) NULL), "Widget table clash in frame.cpp") ; - + wxAddWindowToTable((Widget) m_workArea, this); - + XtTranslations ptr ; - + XtOverrideTranslations((Widget) m_workArea, ptr = XtParseTranslationTable(": resize()")); - + XtFree((char *)ptr); - - XtAddCallback((Widget) m_workArea, XmNfocusCallback, + + XtAddCallback((Widget) m_workArea, XmNfocusCallback, (XtCallbackProc)wxFrameFocusProc, (XtPointer)this); - + /* Part of show-&-hide fix */ XtAddEventHandler((Widget) m_frameShell, StructureNotifyMask, False, (XtEventHandler)wxFrameMapProc, (XtPointer)m_workArea); - + if (x > -1) XtVaSetValues((Widget) m_frameShell, XmNx, x, NULL); if (y > -1) @@ -220,11 +262,11 @@ bool wxFrame::Create(wxWindow *parent, XtVaSetValues((Widget) m_frameShell, XmNwidth, width, NULL); if (height > -1) XtVaSetValues((Widget) m_frameShell, XmNheight, height, NULL); - + m_mainWidget = m_frameWidget; - + ChangeFont(FALSE); - + // This patch comes from Torsten Liermann lier@lier1.muc.de if (XmIsMotifWMRunning( (Widget) m_frameShell )) { @@ -255,7 +297,7 @@ bool wxFrame::Create(wxWindow *parent, XtVaSetValues((Widget) m_frameShell,XmNoverrideRedirect,TRUE,NULL); } XtRealizeWidget((Widget) m_frameShell); - + // Intercept CLOSE messages from the window manager Atom WM_DELETE_WINDOW = XmInternAtom(XtDisplay((Widget) m_frameShell), "WM_DELETE_WINDOW", False); #if (XmREVISION > 1 || XmVERSION > 1) @@ -267,28 +309,34 @@ bool wxFrame::Create(wxWindow *parent, XmAddWMProtocolCallback((Widget) m_frameShell, WM_DELETE_WINDOW, (void (*)())wxCloseFrameCallback, (caddr_t)this); #endif #endif - + ChangeBackgroundColour(); - + PreResize(); - + wxSizeEvent sizeEvent(wxSize(width, height), GetId()); sizeEvent.SetEventObject(this); - + GetEventHandler()->ProcessEvent(sizeEvent); - + return TRUE; } wxFrame::~wxFrame() { + m_isBeingDeleted = TRUE; + + if (m_clientArea) + XtRemoveEventHandler((Widget) m_clientArea, ExposureMask, FALSE, + wxUniversalRepaintProc, (XtPointer) this); + if (GetMainWidget()) Show(FALSE); - + if (m_frameMenuBar) { m_frameMenuBar->DestroyMenuBar(); - + // Hack to stop core dump on Ultrix, OSF, for some strange reason. #if MOTIF_MENUBAR_DELETE_FIX GetMenuBar()->SetMainWidget((WXWidget) NULL); @@ -296,59 +344,59 @@ wxFrame::~wxFrame() delete m_frameMenuBar; m_frameMenuBar = NULL; } - + wxTopLevelWindows.DeleteObject(this); wxModelessWindows.DeleteObject(this); - + if (m_frameStatusBar) delete m_frameStatusBar; - + DestroyChildren(); - + /* int i; for (i = 0; i < wxMAX_STATUS; i++) if (statusTextWidget[i]) XtDestroyWidget (statusTextWidget[i]); - + if (statusLineForm) XtDestroyWidget (statusLineForm); - + if (statusLineWidget) XtDestroyWidget (statusLineWidget); */ - + if (m_workArea) { wxDeleteWindowFromTable((Widget) m_workArea); - + XtDestroyWidget ((Widget) m_workArea); } - + if (m_frameWidget) { wxDeleteWindowFromTable((Widget) m_frameWidget); XtDestroyWidget ((Widget) m_frameWidget); } - + if (m_frameShell) XtDestroyWidget ((Widget) m_frameShell); - + SetMainWidget((WXWidget) NULL); - + /* Check if it's the last top-level window */ - + if (wxTheApp && (wxTopLevelWindows.Number() == 0)) { wxTheApp->SetTopWindow(NULL); - + if (wxTheApp->GetExitOnFrameDelete()) { // Signal to the app that we're going to close wxTheApp->ExitMainLoop(); } } - + } // Get size *available for subwindows* i.e. excluding menu bar, toolbar etc. @@ -356,13 +404,14 @@ void wxFrame::GetClientSize(int *x, int *y) const { Dimension xx, yy; XtVaGetValues((Widget) m_workArea, XmNwidth, &xx, XmNheight, &yy, NULL); - + if (m_frameStatusBar) { int sbw, sbh; m_frameStatusBar->GetSize(& sbw, & sbh); yy -= sbh; } +#if wxUSE_TOOLBAR if (m_frameToolBar) { int tbw, tbh; @@ -372,6 +421,7 @@ void wxFrame::GetClientSize(int *x, int *y) const else yy -= tbh; } +#endif // wxUSE_TOOLBAR /* if (GetMenuBar() != (wxMenuBar*) NULL) { @@ -382,7 +432,7 @@ void wxFrame::GetClientSize(int *x, int *y) const { wxWindow *win = (wxWindow *)node->Data(); hasSubPanel = (win->IsKindOf(CLASSINFO(wxPanel)) && !win->IsKindOf(CLASSINFO(wxDialog))); - + if (hasSubPanel) break; } @@ -393,20 +443,20 @@ void wxFrame::GetClientSize(int *x, int *y) const } } */ - + *x = xx; *y = yy; } // Set the client size (i.e. leave the calculation of borders etc. // to wxWindows) -void wxFrame::SetClientSize(int width, int height) +void wxFrame::DoSetClientSize(int width, int height) { // Calculate how large the new main window should be // by finding the difference between the client area and the // main window area, and adding on to the new client area if (width > -1) XtVaSetValues((Widget) m_workArea, XmNwidth, width, NULL); - + if (height > -1) { if (m_frameStatusBar) @@ -415,6 +465,7 @@ void wxFrame::SetClientSize(int width, int height) m_frameStatusBar->GetSize(& sbw, & sbh); height += sbh; } +#if wxUSE_TOOLBAR if (m_frameToolBar) { int tbw, tbh; @@ -424,16 +475,17 @@ void wxFrame::SetClientSize(int width, int height) else height += tbh; } - +#endif // wxUSE_TOOLBAR + XtVaSetValues((Widget) m_workArea, XmNheight, height, NULL); } PreResize(); - + wxSizeEvent sizeEvent(wxSize(width, height), GetId()); sizeEvent.SetEventObject(this); - + GetEventHandler()->ProcessEvent(sizeEvent); - + } void wxFrame::GetSize(int *width, int *height) const @@ -448,7 +500,7 @@ void wxFrame::GetPosition(int *x, int *y) const Window parent_window = XtWindow((Widget) m_frameShell), next_parent = XtWindow((Widget) m_frameShell), root = RootWindowOfScreen(XtScreen((Widget) m_frameShell)); - + // search for the parent that is child of ROOT, because the WM may // reparent twice and notify only the next parent (like FVWM) while (next_parent != root) { @@ -465,7 +517,7 @@ void wxFrame::GetPosition(int *x, int *y) const if (y) *y = yy; } -void wxFrame::SetSize(int x, int y, int width, int height, int sizeFlags) +void wxFrame::DoSetSize(int x, int y, int width, int height, int sizeFlags) { if (x > -1) XtVaSetValues((Widget) m_frameShell, XmNx, x, NULL); @@ -475,14 +527,14 @@ void wxFrame::SetSize(int x, int y, int width, int height, int sizeFlags) XtVaSetValues((Widget) m_frameWidget, XmNwidth, width, NULL); if (height > -1) XtVaSetValues((Widget) m_frameWidget, XmNheight, height, NULL); - + if (!(height == -1 && width == -1)) { PreResize(); - + wxSizeEvent sizeEvent(wxSize(width, height), GetId()); sizeEvent.SetEventObject(this); - + GetEventHandler()->ProcessEvent(sizeEvent); } } @@ -491,9 +543,9 @@ bool wxFrame::Show(bool show) { if (!m_frameShell) return wxWindow::Show(show); - + m_visibleStatus = show; /* show-&-hide fix */ - + m_isShown = show; if (show) { XtMapWidget((Widget) m_frameShell); @@ -509,7 +561,7 @@ void wxFrame::Iconize(bool iconize) { if (!iconize) Show(TRUE); - + if (m_frameShell) XtVaSetValues((Widget) m_frameShell, XmNiconic, (Boolean)iconize, NULL); } @@ -518,7 +570,7 @@ void wxFrame::Iconize(bool iconize) void wxFrame::Maximize(bool maximize) { Show(TRUE); - + if (maximize && m_frameShell) XtVaSetValues((Widget) m_frameShell, XmNiconic, FALSE, NULL); } @@ -527,7 +579,7 @@ bool wxFrame::IsIconized() const { if (!m_frameShell) return FALSE; - + Boolean iconic; XtVaGetValues((Widget) m_frameShell, XmNiconic, &iconic, NULL); return iconic; @@ -544,11 +596,11 @@ void wxFrame::SetTitle(const wxString& title) { if (title == m_title) return; - + m_title = title; - + if (!title.IsNull()) - XtVaSetValues((Widget) m_frameShell, + XtVaSetValues((Widget) m_frameShell, XmNtitle, (const char*) title, XmNiconName, (const char*) title, NULL); @@ -557,13 +609,13 @@ void wxFrame::SetTitle(const wxString& title) void wxFrame::SetIcon(const wxIcon& icon) { m_icon = icon; - + if (!m_frameShell) return; - + if (!icon.Ok() || !icon.GetPixmap()) return; - + XtVaSetValues((Widget) m_frameShell, XtNiconPixmap, icon.GetPixmap(), NULL); } @@ -571,21 +623,21 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id, const wxString& name) { wxStatusBar *statusBar = NULL; - + statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20), style, name); - + // Set the height according to the font and the border size wxClientDC dc(statusBar); dc.SetFont(statusBar->GetFont()); - + long x, y; dc.GetTextExtent("X", &x, &y); - + int height = (int)( (y * 1.1) + 2* statusBar->GetBorderY()); - + statusBar->SetSize(-1, -1, 100, height); - + statusBar->SetFieldsCount(number); return statusBar; } @@ -594,9 +646,9 @@ wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id, const wxString& name) { // Calling CreateStatusBar twice is an error. - wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, + wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, "recreating status bar in wxFrame" ); - + m_frameStatusBar = OnCreateStatusBar(number, style, id, name); if ( m_frameStatusBar ) @@ -611,14 +663,14 @@ wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id, void wxFrame::SetStatusText(const wxString& text, int number) { wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" ); - + m_frameStatusBar->SetStatusText(text, number); } void wxFrame::SetStatusWidths(int n, const int widths_field[]) { wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" ); - + m_frameStatusBar->SetStatusWidths(n, widths_field); PositionStatusBar(); } @@ -627,12 +679,12 @@ void wxFrame::PositionStatusBar() { if (!m_frameStatusBar) return; - + int w, h; GetClientSize(&w, &h); int sw, sh; m_frameStatusBar->GetSize(&sw, &sh); - + // Since we wish the status bar to be directly under the client area, // we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS. m_frameStatusBar->SetSize(0, h, w, sh); @@ -653,16 +705,16 @@ void wxFrame::SetMenuBar(wxMenuBar *menuBar) m_frameMenuBar = NULL; return; } - + // Currently can't set it twice // wxASSERT_MSG( (m_frameMenuBar == (wxMenuBar*) NULL), "Cannot set the menubar more than once"); - + if (m_frameMenuBar) { m_frameMenuBar->DestroyMenuBar(); delete m_frameMenuBar; } - + m_frameMenuBar = menuBar; m_frameMenuBar->CreateMenuBar(this); } @@ -677,7 +729,7 @@ void wxFrame::Fit() { // Find a child that's a subwindow, but not a dialog box. wxWindow *win = (wxWindow *)node->Data(); - + if (!win->IsKindOf(CLASSINFO(wxFrame)) && !win->IsKindOf(CLASSINFO(wxDialog))) { @@ -685,7 +737,7 @@ void wxFrame::Fit() int x, y; win->GetSize(&width, &height); win->GetPosition(&x, &y); - + if ((x + width) > max_width) max_width = x + width; if ((y + height) > max_height) @@ -701,14 +753,14 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event) { SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); Refresh(); - + if ( m_frameStatusBar ) { wxSysColourChangedEvent event2; event2.SetEventObject( m_frameStatusBar ); m_frameStatusBar->ProcessEvent(event2); } - + // Propagate the event to the non-top-level children wxWindow::OnSysColourChanged(event); } @@ -724,31 +776,34 @@ void wxFrame::OnSize(wxSizeEvent& event) return; } #endif - + // do we have _exactly_ one child? wxWindow *child = NULL; for ( wxNode *node = GetChildren().First(); node; node = node->Next() ) { wxWindow *win = (wxWindow *)node->Data(); if ( !win->IsKindOf(CLASSINFO(wxFrame)) && - !win->IsKindOf(CLASSINFO(wxDialog)) && - (win != GetStatusBar()) && - (win != GetToolBar()) ) + !win->IsKindOf(CLASSINFO(wxDialog)) && + (win != GetStatusBar()) +#if wxUSE_TOOLBAR + && (win != GetToolBar()) +#endif // wxUSE_TOOLBAR + ) { if ( child ) return; // it's our second subwindow - nothing to do child = win; } } - + if ( child ) { // we have exactly one child - set it's size to fill the whole frame int clientW, clientH; GetClientSize(&clientW, &clientH); - + int x = 0; int y = 0; - + child->SetSize(x, y, clientW, clientH); } } @@ -770,21 +825,12 @@ void wxFrame::OnActivate(wxActivateEvent& event) } } -// The default implementation for the close window event - calls +// The default implementation for the close window event. // OnClose for backward compatibility. void wxFrame::OnCloseWindow(wxCloseEvent& event) { - // Compatibility - if ( GetEventHandler()->OnClose() || event.GetForce()) - { - this->Destroy(); - } -} - -bool wxFrame::OnClose() -{ - return TRUE; + this->Destroy(); } // Destroy the window (delayed, if a managed window) @@ -824,15 +870,15 @@ void wxFrame::Centre(int direction) { int display_width, display_height, width, height, x, y; wxDisplaySize(&display_width, &display_height); - + GetSize(&width, &height); GetPosition(&x, &y); - + if (direction & wxHORIZONTAL) x = (int)((display_width - width)/2); if (direction & wxVERTICAL) y = (int)((display_height - height)/2); - + SetSize(x, y, width, height); } @@ -844,34 +890,37 @@ void wxFrame::Command(int id) void wxFrame::ProcessCommand(int id) { - wxCommandEvent commandEvent(wxEVENT_TYPE_MENU_COMMAND, id); - commandEvent.SetInt( id ); - commandEvent.SetEventObject( this ); - - wxMenuBar *bar = GetMenuBar() ; - if (!bar) - return; - - /* TODO: check the menu item if required - wxMenuItem *item = bar->FindItemForId(id) ; - if (item && item->IsCheckable()) - { - bar->Check(id,!bar->Checked(id)) ; - } - */ - - GetEventHandler()->ProcessEvent(commandEvent); + wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id); + commandEvent.SetInt( id ); + commandEvent.SetEventObject( this ); + + wxMenuBar *bar = GetMenuBar() ; + if (!bar) + return; + +/* TODO: check the menu item if required + wxMenuItem *item = bar->FindItemForId(id) ; + if (item && item->IsCheckable()) + { + bar->Check(id,!bar->Checked(id)) ; + } +*/ + + wxEvtHandler* evtHandler = GetEventHandler(); + + evtHandler->ProcessEvent(commandEvent); } // Checks if there is a toolbar, and returns the first free client position wxPoint wxFrame::GetClientAreaOrigin() const { wxPoint pt(0, 0); +#if wxUSE_TOOLBAR if (GetToolBar()) { int w, h; GetToolBar()->GetSize(& w, & h); - + if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL) { pt.x += w; @@ -881,13 +930,15 @@ wxPoint wxFrame::GetClientAreaOrigin() const pt.y += h; } } +#endif // wxUSE_TOOLBAR + return pt; } void wxFrame::ScreenToClient(int *x, int *y) const { wxWindow::ScreenToClient(x, y); - + // We may be faking the client origin. // So a window that's really at (0, 30) may appear // (to wxWin apps) to be at (0, 0). @@ -904,15 +955,16 @@ void wxFrame::ClientToScreen(int *x, int *y) const wxPoint pt1(GetClientAreaOrigin()); *x += pt1.x; *y += pt1.y; - + wxWindow::ClientToScreen(x, y); } +#if wxUSE_TOOLBAR wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) { wxCHECK_MSG( m_frameToolBar == NULL, FALSE, "recreating toolbar in wxFrame" ); - + wxToolBar* toolBar = OnCreateToolBar(style, id, name); if (toolBar) { @@ -931,17 +983,27 @@ wxToolBar* wxFrame::OnCreateToolBar(long style, wxWindowID id, const wxString& n return new wxToolBar(this, id, wxPoint(0, 0), wxSize(100, 24), style, name); } +void wxFrame::SetToolBar(wxToolBar *toolbar) +{ + m_frameToolBar = toolbar; +} + +wxToolBar *wxFrame::GetToolBar() const +{ + return m_frameToolBar; +} + void wxFrame::PositionToolBar() { int cw, ch; - + GetClientSize(& cw, &ch); - + if (GetToolBar()) { int tw, th; GetToolBar()->GetSize(& tw, & th); - + if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL) { // Use the 'real' position. wxSIZE_NO_ADJUSTMENTS @@ -956,12 +1018,13 @@ void wxFrame::PositionToolBar() } } } +#endif // wxUSE_TOOLBAR void wxFrame::CaptureMouse() { if (m_winCaptured) return; - + if (GetMainWidget()) XtAddGrab((Widget) m_frameShell, TRUE, FALSE); m_winCaptured = TRUE; @@ -971,7 +1034,7 @@ void wxFrame::ReleaseMouse() { if (!m_winCaptured) return; - + if (GetMainWidget()) XtRemoveGrab((Widget) m_frameShell); m_winCaptured = FALSE; @@ -1011,31 +1074,24 @@ void wxFrame::Lower(void) XLowerWindow(XtDisplay((Widget) m_frameShell), parent_window); } -void wxFrame::SetToolBar(wxToolBar *toolbar) -{ m_frameToolBar = toolbar; } - -wxToolBar *wxFrame::GetToolBar() const -{ return m_frameToolBar; } - -void wxFrameFocusProc(Widget workArea, XtPointer clientData, +void wxFrameFocusProc(Widget workArea, XtPointer clientData, XmAnyCallbackStruct *cbs) { - wxFrame *frame = (wxFrame *)clientData; - // wxDebugMsg("focus proc from frame %ld\n",(long)frame); // TODO - // frame->GetEventHandler()->OnSetFocus(); + // wxFrame *frame = (wxFrame *)clientData; + // frame->GetEventHandler()->OnSetFocus(); } /* MATTEW: Used to insure that hide-&-show within an event cycle works */ -static void wxFrameMapProc(Widget frameShell, XtPointer clientData, +static void wxFrameMapProc(Widget frameShell, XtPointer clientData, XCrossingEvent * event) { - wxFrame *frame = (wxFrame *)wxWidgetHashTable->Get((long)clientData); - + wxFrame *frame = (wxFrame *)wxGetWindowFromTable((Widget)clientData); + if (frame) { XEvent *e = (XEvent *)event; - + if (e->xany.type == MapNotify) { // Iconize fix @@ -1055,7 +1111,9 @@ static void wxFrameMapProc(Widget frameShell, XtPointer clientData, //// Motif-specific bool wxFrame::PreResize() { +#if wxUSE_TOOLBAR PositionToolBar(); +#endif // wxUSE_TOOLBAR PositionStatusBar(); return TRUE; } @@ -1085,10 +1143,10 @@ void wxFrame::ChangeForegroundColour() void wxCloseFrameCallback(Widget widget, XtPointer client_data, XmAnyCallbackStruct *cbs) { wxFrame *frame = (wxFrame *)client_data; - + wxCloseEvent closeEvent(wxEVT_CLOSE_WINDOW, frame->GetId()); closeEvent.SetEventObject(frame); - + // May delete the frame (with delayed deletion) frame->GetEventHandler()->ProcessEvent(closeEvent); }