X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92f1a59c288e0e181d2998a93220a73b89f675df..118322a3dfcc1803bd13df8193ea1be9ae39e653:/src/msw/frame.cpp diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index f2dff269be..0fd73e50bc 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "frame.h" #endif @@ -79,7 +79,73 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) END_EVENT_TABLE() +#if wxUSE_EXTENDED_RTTI +WX_DEFINE_FLAGS( wxFrameStyle ) + +wxBEGIN_FLAGS( wxFrameStyle ) + // new style border flags, we put them first to + // use them for streaming out + wxFLAGS_MEMBER(wxBORDER_SIMPLE) + wxFLAGS_MEMBER(wxBORDER_SUNKEN) + wxFLAGS_MEMBER(wxBORDER_DOUBLE) + wxFLAGS_MEMBER(wxBORDER_RAISED) + wxFLAGS_MEMBER(wxBORDER_STATIC) + wxFLAGS_MEMBER(wxBORDER_NONE) + + // old style border flags + wxFLAGS_MEMBER(wxSIMPLE_BORDER) + wxFLAGS_MEMBER(wxSUNKEN_BORDER) + wxFLAGS_MEMBER(wxDOUBLE_BORDER) + wxFLAGS_MEMBER(wxRAISED_BORDER) + wxFLAGS_MEMBER(wxSTATIC_BORDER) + wxFLAGS_MEMBER(wxBORDER) + + // standard window styles + wxFLAGS_MEMBER(wxTAB_TRAVERSAL) + wxFLAGS_MEMBER(wxCLIP_CHILDREN) + wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) + wxFLAGS_MEMBER(wxWANTS_CHARS) + wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) + wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) + wxFLAGS_MEMBER(wxVSCROLL) + wxFLAGS_MEMBER(wxHSCROLL) + + // frame styles + wxFLAGS_MEMBER(wxSTAY_ON_TOP) + wxFLAGS_MEMBER(wxCAPTION) + wxFLAGS_MEMBER(wxTHICK_FRAME) + wxFLAGS_MEMBER(wxSYSTEM_MENU) + wxFLAGS_MEMBER(wxRESIZE_BORDER) + wxFLAGS_MEMBER(wxRESIZE_BOX) + wxFLAGS_MEMBER(wxCLOSE_BOX) + wxFLAGS_MEMBER(wxMAXIMIZE_BOX) + wxFLAGS_MEMBER(wxMINIMIZE_BOX) + + wxFLAGS_MEMBER(wxFRAME_TOOL_WINDOW) + wxFLAGS_MEMBER(wxFRAME_FLOAT_ON_PARENT) + + wxFLAGS_MEMBER(wxFRAME_SHAPED) + +wxEND_FLAGS( wxFrameStyle ) + +IMPLEMENT_DYNAMIC_CLASS_XTI(wxFrame, wxTopLevelWindow,"wx/frame.h") + +wxBEGIN_PROPERTIES_TABLE(wxFrame) + wxEVENT_PROPERTY( Menu , wxEVT_COMMAND_MENU_SELECTED , wxCommandEvent) + + wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxPROPERTY_FLAGS( WindowStyle , wxFrameStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style + wxPROPERTY( MenuBar , wxMenuBar * , SetMenuBar , GetMenuBar , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) +wxEND_PROPERTIES_TABLE() + +wxBEGIN_HANDLERS_TABLE(wxFrame) +wxEND_HANDLERS_TABLE() + +wxCONSTRUCTOR_6( wxFrame , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle) + +#else IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) +#endif // ============================================================================ // implementation @@ -91,9 +157,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) #if wxUSE_STATUSBAR #if wxUSE_NATIVE_STATUSBAR - bool wxFrame::m_useNativeStatusBar = TRUE; + bool wxFrame::m_useNativeStatusBar = true; #else - bool wxFrame::m_useNativeStatusBar = FALSE; + bool wxFrame::m_useNativeStatusBar = false; #endif #endif // wxUSE_NATIVE_STATUSBAR @@ -106,16 +172,13 @@ void wxFrame::Init() #if wxUSE_TOOLTIPS m_hwndToolTip = 0; #endif -#ifdef __WXWINCE__ - m_commandBar = 0; -#endif // Data to save/restore when calling ShowFullScreen m_fsStatusBarFields = 0; m_fsStatusBarHeight = 0; m_fsToolBarHeight = 0; - m_wasMinimized = FALSE; + m_wasMinimized = false; } bool wxFrame::Create(wxWindow *parent, @@ -127,23 +190,21 @@ bool wxFrame::Create(wxWindow *parent, const wxString& name) { if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) ) - return FALSE; + return false; SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); - wxModelessWindows.Append(this); +#ifdef __SMARTPHONE__ + SetLeftMenu(wxID_EXIT, _("Done")); +#endif - return TRUE; + return true; } wxFrame::~wxFrame() { - m_isBeingDeleted = TRUE; + m_isBeingDeleted = true; DeleteAllBars(); -#ifdef __WXWINCE__ - RemoveCommandBar(); -#endif - } // ---------------------------------------------------------------------------- @@ -223,7 +284,7 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number, wxWindowID id, const wxString& name) { - wxStatusBar *statusBar = NULL; + wxStatusBar *statusBar wxDUMMY_INITIALIZE(NULL); #if wxUSE_NATIVE_STATUSBAR if ( !UsesNativeStatusBar() ) @@ -261,6 +322,56 @@ void wxFrame::PositionStatusBar() void wxFrame::AttachMenuBar(wxMenuBar *menubar) { +#if defined(__SMARTPHONE__) + + wxMenu *autoMenu = NULL; + + if( menubar->GetMenuCount() == 1 ) + { + autoMenu = wxTopLevelWindowMSW::ButtonMenu::DuplicateMenu(menubar->GetMenu(0)); + SetRightMenu(wxID_ANY, menubar->GetLabelTop(0), autoMenu); + } + else + { + autoMenu = new wxMenu; + + for( size_t n = 0; n < menubar->GetMenuCount(); n++ ) + { + wxMenu *item = menubar->GetMenu(n); + wxString label = menubar->GetLabelTop(n); + wxMenu *new_item = wxTopLevelWindowMSW::ButtonMenu::DuplicateMenu(item); + autoMenu->Append(wxID_ANY, label, new_item); + } + + SetRightMenu(wxID_ANY, _("Menu"), autoMenu); + } + +#elif defined(WINCE_WITHOUT_COMMANDBAR) + if (!GetToolBar()) + { + wxToolBar* toolBar = new wxToolBar(this, wxID_ANY, + wxDefaultPosition, wxDefaultSize, + wxBORDER_NONE | wxTB_HORIZONTAL, + wxToolBarNameStr, menubar); + SetToolBar(toolBar); + menubar->SetToolBar(toolBar); + } + // Now adjust size for menu bar + int menuHeight = 26; + + //When the main window is created using CW_USEDEFAULT the height of the + // is created is not taken into account). So we resize the window after + // if a menubar is present + { + RECT rc; + ::GetWindowRect((HWND) GetHWND(), &rc); + // adjust for menu / titlebar height + rc.bottom -= (2*menuHeight-1); + + ::MoveWindow((HWND) GetHWND(), rc.left, rc.top, rc.right, rc.bottom, FALSE); + } +#endif + wxFrameBase::AttachMenuBar(menubar); if ( !menubar ) @@ -271,6 +382,7 @@ void wxFrame::AttachMenuBar(wxMenuBar *menubar) } else // set new non NULL menu bar { +#if !defined(__WXWINCE__) || defined(WINCE_WITH_COMMANDBAR) // Can set a menubar several times. if ( menubar->GetHMenu() ) { @@ -286,29 +398,15 @@ void wxFrame::AttachMenuBar(wxMenuBar *menubar) return; } } - +#endif InternalSetMenuBar(); } } void wxFrame::InternalSetMenuBar() { -#ifdef __WXMICROWIN__ +#if defined(__WXMICROWIN__) || defined(__WXWINCE__) // Nothing -#elif defined(__WXWINCE__) - - CreateCommandBar() ; - - if (m_commandBar) - { - if (!CommandBar_InsertMenubarEx((HWND) m_commandBar, NULL, - (LPTSTR) (HMENU) m_hMenu, 0)) - { - wxFAIL_MSG( _T("failed to set menubar") ); - return; - } - CommandBar_DrawMenuBar((HWND) m_commandBar, 0); - } #else if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) ) { @@ -338,16 +436,17 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event) wxWindow::OnSysColourChanged(event); } -// Pass TRUE to show full screen, FALSE to restore. +// Pass true to show full screen, false to restore. bool wxFrame::ShowFullScreen(bool show, long style) { if ( IsFullScreen() == show ) - return FALSE; + return false; if (show) { #if wxUSE_TOOLBAR -#ifdef __WXWINCE__ + +#if defined(WINCE_WITH_COMMANDBAR) // TODO: hide commandbar #else wxToolBar *theToolBar = GetToolBar(); @@ -358,14 +457,16 @@ bool wxFrame::ShowFullScreen(bool show, long style) if ((style & wxFULLSCREEN_NOTOOLBAR) && theToolBar) { - theToolBar->SetSize(-1,0); - theToolBar->Show(FALSE); + theToolBar->SetSize(wxDefaultCoord,0); + theToolBar->Show(false); } #endif // __WXWINCE__ #endif // wxUSE_TOOLBAR +#if defined(__WXMICROWIN__) +#elif defined(__WXWINCE__) // TODO: make it work for WinCE -#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) +#else if (style & wxFULLSCREEN_NOMENUBAR) SetMenu((HWND)GetHWND(), (HMENU) NULL); #endif @@ -381,7 +482,7 @@ bool wxFrame::ShowFullScreen(bool show, long style) //m_fsStatusBarFields = theStatusBar->GetFieldsCount(); //SetStatusBar((wxStatusBar*) NULL); //delete theStatusBar; - theStatusBar->Show(FALSE); + theStatusBar->Show(false); } else m_fsStatusBarFields = 0; @@ -390,7 +491,7 @@ bool wxFrame::ShowFullScreen(bool show, long style) else { #if wxUSE_TOOLBAR -#ifdef __WXWINCE__ +#if defined(WINCE_WITHOUT_COMMANDBAR) // TODO: show commandbar #else wxToolBar *theToolBar = GetToolBar(); @@ -398,8 +499,8 @@ bool wxFrame::ShowFullScreen(bool show, long style) // restore the toolbar, menubar, and statusbar if (theToolBar && (m_fsStyle & wxFULLSCREEN_NOTOOLBAR)) { - theToolBar->SetSize(-1, m_fsToolBarHeight); - theToolBar->Show(TRUE); + theToolBar->SetSize(wxDefaultCoord, m_fsToolBarHeight); + theToolBar->Show(true); } #endif // __WXWINCE__ #endif // wxUSE_TOOLBAR @@ -410,14 +511,16 @@ bool wxFrame::ShowFullScreen(bool show, long style) //CreateStatusBar(m_fsStatusBarFields); if (GetStatusBar()) { - GetStatusBar()->Show(TRUE); + GetStatusBar()->Show(true); PositionStatusBar(); } } #endif // wxUSE_STATUSBAR +#if defined(__WXMICROWIN__) +#elif defined(__WXWINCE__) // TODO: make it work for WinCE -#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) +#else if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0)) SetMenu((HWND)GetHWND(), (HMENU)m_hMenu); #endif @@ -434,6 +537,11 @@ bool wxFrame::ShowFullScreen(bool show, long style) wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) { +#if defined(WINCE_WITHOUT_COMMANDBAR) + // We may already have a toolbar from calling SetMenuBar. + if (GetToolBar()) + return GetToolBar(); +#endif if ( wxFrameBase::CreateToolBar(style, id, name) ) { PositionToolBar(); @@ -447,7 +555,7 @@ void wxFrame::PositionToolBar() wxToolBar *toolbar = GetToolBar(); if ( toolbar && toolbar->IsShown() ) { -#ifdef __WXWINCE__ +#if defined(WINCE_WITHOUT_COMMANDBAR) // We want to do something different in WinCE, because // the toolbar should be associated with the commandbar, // and not an independent window. @@ -466,23 +574,75 @@ void wxFrame::PositionToolBar() } #endif // wxUSE_STATUSBAR + int x = 0; + int y = 0; +#if defined(WINCE_WITH_COMMANDBAR) + // We're using a commandbar - so we have to allow for it. + if (GetMenuBar() && GetMenuBar()->GetCommandBar()) + { + RECT rect; + ::GetWindowRect((HWND) GetMenuBar()->GetCommandBar(), &rect); + y = rect.bottom - rect.top; + } +#endif + + int tx, ty; int tw, th; + toolbar->GetPosition(&tx, &ty); toolbar->GetSize(&tw, &th); + // Adjust + if (ty < 0 && (-ty == th)) + ty = 0; + if (tx < 0 && (-tx == tw)) + tx = 0; + + int desiredW = tw; + int desiredH = th; + if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL ) { - th = height; + desiredH = height; } else { - tw = width; - if ( toolbar->GetWindowStyleFlag() & wxTB_FLAT ) - th -= 3; + desiredW = width; +// if ( toolbar->GetWindowStyleFlag() & wxTB_FLAT ) +// desiredW -= 3; } // use the 'real' MSW position here, don't offset relativly to the // client area origin - toolbar->SetSize(0, 0, tw, th, wxSIZE_NO_ADJUSTMENTS); + + // Optimise such that we don't have to always resize the toolbar + // when the frame changes, otherwise we'll get a lot of flicker. + bool heightChanging wxDUMMY_INITIALIZE(true); + bool widthChanging wxDUMMY_INITIALIZE(true); + + if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL ) + { + // It's OK if the current height is greater than what can be shown. + heightChanging = (desiredH > th) ; + widthChanging = (desiredW != tw) ; + + // The next time around, we may not have to set the size + if (heightChanging) + desiredH = desiredH + 200; + } + else + { + // It's OK if the current width is greater than what can be shown. + widthChanging = (desiredW > tw) ; + heightChanging = (desiredH != th) ; + + // The next time around, we may not have to set the size + if (widthChanging) + desiredW = desiredW + 200; + } + + if (tx != 0 || ty != 0 || widthChanging || heightChanging) + toolbar->SetSize(x, y, desiredW, desiredH, wxSIZE_NO_ADJUSTMENTS); + #endif // __WXWINCE__ } } @@ -529,14 +689,12 @@ void wxFrame::IconizeChildFrames(bool bIconize) // restoring it if ( bIconize ) { - // note that we shouldn't touch the hidden frames neither - // because iconizing/restoring them would show them as a side - // effect - frame->m_wasMinimized = frame->IsIconized() || !frame->IsShown(); + frame->m_wasMinimized = frame->IsIconized(); } - // this test works for both iconizing and restoring - if ( !frame->m_wasMinimized ) + // note that we shouldn't touch the hidden frames neither because + // iconizing/restoring them would show them as a side effect + if ( !frame->m_wasMinimized && frame->IsShown() ) frame->Iconize(bIconize); } } @@ -559,18 +717,18 @@ WXHICON wxFrame::GetDefaultIcon() const bool wxFrame::MSWTranslateMessage(WXMSG* pMsg) { if ( wxWindow::MSWTranslateMessage(pMsg) ) - return TRUE; + return true; #if wxUSE_MENUS && wxUSE_ACCEL && !defined(__WXUNIVERSAL__) // try the menu bar accels wxMenuBar *menuBar = GetMenuBar(); if ( !menuBar ) - return FALSE; + return false; const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable(); return acceleratorTable.Translate(this, pMsg); #else - return FALSE; + return false; #endif // wxUSE_MENUS && wxUSE_ACCEL } @@ -581,7 +739,7 @@ bool wxFrame::MSWTranslateMessage(WXMSG* pMsg) bool wxFrame::HandlePaint() { RECT rect; - if ( GetUpdateRect(GetHwnd(), &rect, FALSE) ) + if ( ::GetUpdateRect(GetHwnd(), &rect, FALSE) ) { #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) if ( m_iconized ) @@ -615,7 +773,7 @@ bool wxFrame::HandlePaint() ::EndPaint(GetHwnd(), &ps); - return TRUE; + return true; } else #endif @@ -626,13 +784,13 @@ bool wxFrame::HandlePaint() else { // nothing to paint - processed - return TRUE; + return true; } } bool wxFrame::HandleSize(int x, int y, WXUINT id) { - bool processed = FALSE; + bool processed = false; #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) switch ( id ) @@ -645,9 +803,9 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id) break; // restore all child frames too - IconizeChildFrames(FALSE); + IconizeChildFrames(false); - (void)SendIconizeEvent(FALSE); + (void)SendIconizeEvent(false); // fall through @@ -657,11 +815,11 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id) case SIZEICONIC: // iconize all child frames too - IconizeChildFrames(TRUE); + IconizeChildFrames(true); (void)SendIconizeEvent(); - m_iconized = TRUE; + m_iconized = true; break; } #endif @@ -676,6 +834,23 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id) PositionToolBar(); #endif // wxUSE_TOOLBAR +#if defined(WINCE_WITH_COMMANDBAR) + // Position the menu command bar + if (GetMenuBar() && GetMenuBar()->GetCommandBar()) + { + RECT rect; + ::GetWindowRect((HWND) GetMenuBar()->GetCommandBar(), &rect); + wxSize clientSz = GetClientSize(); + + if ( !::MoveWindow((HWND) GetMenuBar()->GetCommandBar(), 0, 0, clientSz.x, rect.bottom - rect.top, true ) ) + { + wxLogLastError(wxT("MoveWindow")); + } + + } +#endif + + processed = wxWindow::HandleSize(x, y, id); } @@ -705,13 +880,21 @@ bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) } #endif // wxUSE_MENUS_NATIVE +#ifdef __SMARTPHONE__ + // handle here commands from Smartphone menu bar + if ( wxTopLevelWindow::HandleCommand(id, cmd, control ) ) + { + return true; + } +#endif // __SMARTPHONE__ + if ( ProcessCommand(id) ) { - return TRUE; + return true; } } - return FALSE; + return false; } bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu) @@ -734,9 +917,9 @@ bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu) // items opening popup menus (they don't have them anyhow) but do clear // the status line - otherwise, we would be left with the help message // for the previous item which doesn't apply any more - DoGiveHelp(wxEmptyString, FALSE); + DoGiveHelp(wxEmptyString, false); - return FALSE; + return false; } wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item); @@ -759,10 +942,10 @@ bool wxFrame::HandleMenuLoop(const wxEventType& evtType, WXWORD isPopup) // the window proc for wxFrame // --------------------------------------------------------------------------- -long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) +WXLRESULT wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { - long rc = 0; - bool processed = FALSE; + WXLRESULT rc = 0; + bool processed = false; switch ( message ) { @@ -844,36 +1027,51 @@ bool wxFrame::HandleInitMenuPopup(WXHMENU hMenu) } } } - + wxMenuEvent event(wxEVT_MENU_OPEN, 0, menu); event.SetEventObject(this); return GetEventHandler()->ProcessEvent(event); } -#ifdef __WXWINCE__ -WXHWND wxFrame::CreateCommandBar() +// ---------------------------------------------------------------------------- +// wxFrame size management: we exclude the areas taken by menu/status/toolbars +// from the client area, so the client area is what's really available for the +// frame contents +// ---------------------------------------------------------------------------- + +// get the origin of the client area in the client coordinates +wxPoint wxFrame::GetClientAreaOrigin() const { - if (m_commandBar) - return m_commandBar; + wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin(); - m_commandBar = (WXHWND) CommandBar_Create(wxGetInstance(), GetHwnd(), NewControlId()); - if (!m_commandBar) +#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__) && \ + (!defined(__WXWINCE__) || (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__))) + wxToolBar *toolbar = GetToolBar(); + if ( toolbar && toolbar->IsShown() ) { - wxFAIL_MSG( _T("failed to create commandbar") ); - return 0; + int w, h; + toolbar->GetSize(&w, &h); + + if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL ) + { + pt.x += w; + } + else + { + pt.y += h; + } } - return m_commandBar; -} +#endif // wxUSE_TOOLBAR -void wxFrame::RemoveCommandBar() -{ - if (m_commandBar) +#if defined(WINCE_WITH_COMMANDBAR) + if (GetMenuBar() && GetMenuBar()->GetCommandBar()) { - ::DestroyWindow((HWND) m_commandBar); - m_commandBar = NULL; + RECT rect; + ::GetWindowRect((HWND) GetMenuBar()->GetCommandBar(), &rect); + pt.y += (rect.bottom - rect.top); } -} #endif - + return pt; +}