X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8b9518ee4a9cb8f6d4934afaed07aea011ec5ab1..11bc0805dec30cdc07c17cc13d075520efd4e17a:/src/msw/frame.cpp diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index 380bcc95a2..a45bf2ea6b 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -33,6 +33,7 @@ #include "wx/msw/private.h" #include "wx/statusbr.h" +#include "wx/toolbar.h" #include "wx/menuitem.h" #ifdef LoadAccelerators @@ -46,6 +47,7 @@ extern wxList wxModelessWindows; extern wxList wxPendingDelete; extern char wxFrameClassName[]; +extern wxMenu *wxCurrentPopupMenu; #if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxFrame, wxWindow) @@ -68,6 +70,7 @@ bool wxFrame::m_useNativeStatusBar = FALSE; wxFrame::wxFrame(void) { + m_frameToolBar = NULL ; m_frameMenuBar = NULL; m_frameStatusBar = NULL; @@ -90,6 +93,7 @@ bool wxFrame::Create(wxWindow *parent, // m_modalShowing = FALSE; m_windowStyle = style; m_frameMenuBar = NULL; + m_frameToolBar = NULL ; m_frameStatusBar = NULL; SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); @@ -108,8 +112,11 @@ bool wxFrame::Create(wxWindow *parent, int height = size.y; m_iconized = FALSE; - MSWCreate(m_windowId, (wxWindow *)parent, wxFrameClassName, this, (char *)(const char *)title, - x, y, width, height, style); + + // we pass NULL as parent to MSWCreate because frames with parents behave + // very strangely under Win95 shell + MSWCreate(m_windowId, NULL, wxFrameClassName, this, title, + x, y, width, height, style); wxModelessWindows.Append(this); return TRUE; @@ -152,19 +159,23 @@ WXHMENU wxFrame::GetWinMenu(void) const return m_hMenu; } -// Get size *available for subwindows* i.e. excluding menu bar etc. -// For XView, this is the same as GetSize +// Get size *available for subwindows* i.e. excluding menu bar, toolbar etc. void wxFrame::GetClientSize(int *x, int *y) const { RECT rect; GetClientRect((HWND) GetHWND(), &rect); - if ( m_frameStatusBar ) + if ( GetStatusBar() ) { - int statusX, statusY; - m_frameStatusBar->GetClientSize(&statusX, &statusY); - rect.bottom -= statusY; + int statusX, statusY; + GetStatusBar()->GetClientSize(&statusX, &statusY); + rect.bottom -= statusY; } + + wxPoint pt(GetClientAreaOrigin()); + rect.bottom -= pt.y; + rect.right -= pt.x; + *x = rect.right; *y = rect.bottom; } @@ -187,13 +198,17 @@ void wxFrame::SetClientSize(int width, int height) int actual_width = rect2.right - rect2.left - rect.right + width; int actual_height = rect2.bottom - rect2.top - rect.bottom + height; - if ( m_frameStatusBar ) + if ( GetStatusBar() ) { - int statusX, statusY; - m_frameStatusBar->GetClientSize(&statusX, &statusY); - actual_height += statusY; + int statusX, statusY; + GetStatusBar()->GetClientSize(&statusX, &statusY); + actual_height += statusY; } + wxPoint pt(GetClientAreaOrigin()); + actual_width += pt.y; + actual_height += pt.x; + POINT point; point.x = rect2.left; point.y = rect2.top; @@ -337,19 +352,21 @@ void wxFrame::SetIcon(const wxIcon& icon) #endif } -wxStatusBar *wxFrame::OnCreateStatusBar(int number) +wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id, + const wxString& name) { wxStatusBar *statusBar = NULL; #if USE_NATIVE_STATUSBAR if (UsesNativeStatusBar()) { - statusBar = new wxStatusBar95(this); + statusBar = new wxStatusBar95(this, id, style); } else #endif { - statusBar = new wxStatusBar(this, -1, wxPoint(0, 0), wxSize(100, 20)); + 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); @@ -367,20 +384,22 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number) return statusBar; } -bool wxFrame::CreateStatusBar(int number) +wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id, + const wxString& name) { // VZ: calling CreateStatusBar twice is an error - why anyone would do it? wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, "recreating status bar in wxFrame" ); - m_frameStatusBar = OnCreateStatusBar(number); + m_frameStatusBar = OnCreateStatusBar(number, style, id, + name); if ( m_frameStatusBar ) { PositionStatusBar(); - return TRUE; + return m_frameStatusBar; } else - return FALSE; + return NULL; } void wxFrame::SetStatusText(const wxString& text, int number) @@ -411,6 +430,9 @@ void wxFrame::PositionStatusBar(void) 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); } } @@ -461,6 +483,7 @@ void wxFrame::SetMenuBar(wxMenuBar *menu_bar) menu_bar->m_menuBarFrame = this; } +#if 0 bool wxFrame::LoadAccelerators(const wxString& table) { m_acceleratorTable = (WXHANDLE) @@ -480,6 +503,7 @@ bool wxFrame::LoadAccelerators(const wxString& table) return (m_acceleratorTable != (WXHANDLE) NULL); } +#endif void wxFrame::Fit(void) { @@ -596,7 +620,7 @@ void wxFrame::MSWCreate(int id, wxWindow *parent, const char *wclass, wxWindow * bool wxFrame::MSWOnPaint(void) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxFrameWnd::OnPaint %d\n", handle); #endif RECT rect; @@ -653,18 +677,33 @@ WXHICON wxFrame::MSWOnQueryDragIcon(void) void wxFrame::MSWOnSize(int x, int y, WXUINT id) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxFrameWnd::OnSize %d\n", m_hWnd); #endif switch (id) { - case SIZEFULLSCREEN: case SIZENORMAL: + // only do it it if we were iconized before, otherwise resizing the + // parent frame has a curious side effect of bringing it under it's + // children + if ( !m_iconized ) + break; + + // restore all child frames too + IconizeChildFrames(FALSE); + + // fall through + + case SIZEFULLSCREEN: m_iconized = FALSE; - break; + break; + case SIZEICONIC: + // iconize all child frames too + IconizeChildFrames(TRUE); + m_iconized = TRUE; - break; + break; } if (!m_iconized) @@ -681,6 +720,8 @@ void wxFrame::MSWOnSize(int x, int y, WXUINT id) #endif PositionStatusBar(); + PositionToolBar(); + wxSizeEvent event(wxSize(x, y), m_windowId); event.SetEventObject( this ); if (!GetEventHandler()->ProcessEvent(event)) @@ -690,7 +731,7 @@ void wxFrame::MSWOnSize(int x, int y, WXUINT id) bool wxFrame::MSWOnClose(void) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxFrameWnd::OnClose %d\n", handle); #endif return Close(); @@ -698,7 +739,7 @@ bool wxFrame::MSWOnClose(void) bool wxFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxFrameWnd::OnCommand %d\n", handle); #endif if (cmd == 0 || cmd == 1 ) // Can be either a menu command or an accelerator. @@ -708,6 +749,14 @@ bool wxFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control) if (win) return win->MSWCommand(cmd, id); + if (wxCurrentPopupMenu) + { + wxMenu *popupMenu = wxCurrentPopupMenu; + wxCurrentPopupMenu = NULL; + if (popupMenu->MSWCommand(cmd, id)) + return TRUE; + } + if (GetMenuBar() && GetMenuBar()->FindItemForId(id)) { ProcessCommand(id); @@ -738,8 +787,13 @@ void wxFrame::MSWOnMenuHighlight(WXWORD nItem, WXWORD nFlags, WXHMENU hSysMenu) bool wxFrame::MSWProcessMessage(WXMSG* pMsg) { - if (m_acceleratorTable != 0 && - ::TranslateAccelerator((HWND) GetHWND(), (HANDLE) m_acceleratorTable, (MSG *)pMsg)) + return FALSE; +} + +bool wxFrame::MSWTranslateMessage(WXMSG* pMsg) +{ + if (m_acceleratorTable.Ok() && + ::TranslateAccelerator((HWND) GetHWND(), (HACCEL) m_acceleratorTable.GetHACCEL(), (MSG *)pMsg)) return TRUE; return FALSE; @@ -749,47 +803,40 @@ bool wxFrame::MSWProcessMessage(WXMSG* pMsg) // resize to client rectangle size void wxFrame::OnSize(wxSizeEvent& event) { - // Search for a child which is a subwindow, not another frame. + // if we're using constraints - do use them + #if USE_CONSTRAINTS + if ( GetAutoLayout() ) { + Layout(); + return; + } + #endif + + // do we have _exactly_ one child? wxWindow *child = NULL; - // Count the number of _subwindow_ children - int noChildren = 0; - for(wxNode *node = GetChildren()->First(); node; node = node->Next()) + 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())) + if ( !win->IsKindOf(CLASSINFO(wxFrame)) && + !win->IsKindOf(CLASSINFO(wxDialog)) && + (win != GetStatusBar()) && + (win != GetToolBar()) ) { + if ( child ) + return; // it's our second subwindow - nothing to do child = win; - noChildren ++; } } - // If not one child, call the Layout function if compiled in - if (!child || (noChildren > 1) -#if USE_CONSTRAINTS - || GetAutoLayout() -#endif - ) - { -#if USE_CONSTRAINTS - if (GetAutoLayout()) - Layout(); -#endif - return; - } - - if (child) - { - int client_x, client_y; + if ( child ) { + // we have exactly one child - set it's size to fill the whole frame + int clientW, clientH; + GetClientSize(&clientW, &clientH); -#if DEBUG > 1 - wxDebugMsg("wxFrame::OnSize: about to set the child's size.\n"); -#endif + int x = 0; + int y = 0; - GetClientSize(&client_x, &client_y); - child->SetSize(0, 0, client_x, client_y); + child->SetSize(x, y, clientW, clientH); } - } // Default activation behaviour - set the focus for the first child @@ -803,7 +850,7 @@ void wxFrame::OnActivate(wxActivateEvent& event) if (!child->IsKindOf(CLASSINFO(wxFrame)) && !child->IsKindOf(CLASSINFO(wxDialog))) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxFrame::OnActivate: about to set the child's focus.\n"); #endif child->SetFocus(); @@ -824,6 +871,11 @@ void wxFrame::OnCloseWindow(wxCloseEvent& event) } } +bool wxFrame::OnClose(void) +{ + return TRUE; +} + // Destroy the window (delayed, if a managed window) bool wxFrame::Destroy(void) { @@ -897,52 +949,89 @@ void wxFrame::ProcessCommand(int id) GetEventHandler()->ProcessEvent(commandEvent); } -void wxFrame::OnIdle(wxIdleEvent& event) +// Checks if there is a toolbar, and returns the first free client position +wxPoint wxFrame::GetClientAreaOrigin() const { - DoMenuUpdates(); + wxPoint pt(0, 0); + if (GetToolBar()) + { + int w, h; + GetToolBar()->GetSize(& w, & h); + + if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL) + { + pt.x += w; + } + else + { + pt.y += h; + } + } + return pt; } -// Query app for menu item updates (called from OnIdle) -void wxFrame::DoMenuUpdates(void) +wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) { - wxMenuBar* bar = GetMenuBar(); - if (!bar) - return; + wxCHECK_MSG( m_frameToolBar == NULL, FALSE, + "recreating toolbar in wxFrame" ); - int i; - for (i = 0; i < bar->m_menuCount; i++) - { - wxMenu* menu = bar->m_menus[i]; + wxToolBar* toolBar = OnCreateToolBar(style, id, name); + if (toolBar) + { + SetToolBar(toolBar); + PositionToolBar(); + return toolBar; + } + else + { + return NULL; + } +} - DoMenuUpdates(menu); - } +wxToolBar* wxFrame::OnCreateToolBar(long style, wxWindowID id, const wxString& name) +{ + return new wxToolBar(this, id, wxDefaultPosition, wxDefaultSize, style, name); } -void wxFrame::DoMenuUpdates(wxMenu* menu) +void wxFrame::PositionToolBar(void) { - wxNode* node = menu->m_menuItems.First(); - while (node) - { - wxMenuItem* item = (wxMenuItem*) node->Data(); - if ( !item->IsSeparator() ) + RECT rect; + ::GetClientRect((HWND) GetHWND(), &rect); + + if ( GetStatusBar() ) { - wxWindowID id = item->GetId(); - wxUpdateUIEvent event(id); - event.SetEventObject( this ); + int statusX, statusY; + GetStatusBar()->GetClientSize(&statusX, &statusY); + rect.bottom -= statusY; + } - if (GetEventHandler()->ProcessEvent(event)) - { - if (event.GetSetText()) - menu->SetLabel(id, event.GetText()); - if (event.GetSetChecked()) - menu->Check(id, event.GetChecked()); - if (event.GetSetEnabled()) - menu->Enable(id, event.GetEnabled()); - } + if (GetToolBar()) + { + int tw, th; + GetToolBar()->GetSize(& tw, & th); + + if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL) + { + // Use the 'real' MSW position + GetToolBar()->SetSize(0, 0, tw, rect.bottom, wxSIZE_NO_ADJUSTMENTS); + } + else + { + // Use the 'real' MSW position + GetToolBar()->SetSize(0, 0, rect.right, th, wxSIZE_NO_ADJUSTMENTS); + } + } +} - if (item->GetSubMenu()) - DoMenuUpdates(item->GetSubMenu()); +// propagate our state change to all child frames +void wxFrame::IconizeChildFrames(bool bIconize) +{ + wxWindow *child = NULL; + for ( wxNode *node = GetChildren()->First(); node; node = node->Next() ) { + wxWindow *win = (wxWindow *)node->Data(); + if ( win->IsKindOf(CLASSINFO(wxFrame)) ) { + ((wxFrame *)win)->Iconize(bIconize); } - node = node->Next(); } } +