X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/09785dd38dd19ef122acd0933677fa86a0b3232e..2fc2d511d0f095ab5de3713cff6042832f886d15:/src/msw/frame.cpp diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index 89e9716b0b..64e7a9d85e 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 ) + +WX_BEGIN_FLAGS( wxFrameStyle ) + // new style border flags, we put them first to + // use them for streaming out + WX_FLAGS_MEMBER(wxBORDER_SIMPLE) + WX_FLAGS_MEMBER(wxBORDER_SUNKEN) + WX_FLAGS_MEMBER(wxBORDER_DOUBLE) + WX_FLAGS_MEMBER(wxBORDER_RAISED) + WX_FLAGS_MEMBER(wxBORDER_STATIC) + WX_FLAGS_MEMBER(wxBORDER_NONE) + + // old style border flags + WX_FLAGS_MEMBER(wxSIMPLE_BORDER) + WX_FLAGS_MEMBER(wxSUNKEN_BORDER) + WX_FLAGS_MEMBER(wxDOUBLE_BORDER) + WX_FLAGS_MEMBER(wxRAISED_BORDER) + WX_FLAGS_MEMBER(wxSTATIC_BORDER) + WX_FLAGS_MEMBER(wxNO_BORDER) + + // standard window styles + WX_FLAGS_MEMBER(wxTAB_TRAVERSAL) + WX_FLAGS_MEMBER(wxCLIP_CHILDREN) + WX_FLAGS_MEMBER(wxTRANSPARENT_WINDOW) + WX_FLAGS_MEMBER(wxWANTS_CHARS) + WX_FLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE) + WX_FLAGS_MEMBER(wxALWAYS_SHOW_SB ) + WX_FLAGS_MEMBER(wxVSCROLL) + WX_FLAGS_MEMBER(wxHSCROLL) + + // frame styles + WX_FLAGS_MEMBER(wxSTAY_ON_TOP) + WX_FLAGS_MEMBER(wxCAPTION) + WX_FLAGS_MEMBER(wxTHICK_FRAME) + WX_FLAGS_MEMBER(wxSYSTEM_MENU) + WX_FLAGS_MEMBER(wxRESIZE_BORDER) + WX_FLAGS_MEMBER(wxRESIZE_BOX) + WX_FLAGS_MEMBER(wxCLOSE_BOX) + WX_FLAGS_MEMBER(wxMAXIMIZE_BOX) + WX_FLAGS_MEMBER(wxMINIMIZE_BOX) + + WX_FLAGS_MEMBER(wxFRAME_TOOL_WINDOW) + WX_FLAGS_MEMBER(wxFRAME_FLOAT_ON_PARENT) + + WX_FLAGS_MEMBER(wxFRAME_SHAPED) + +WX_END_FLAGS( wxFrameStyle ) + +IMPLEMENT_DYNAMIC_CLASS_XTI(wxFrame, wxTopLevelWindow,"wx/frame.h") + +WX_BEGIN_PROPERTIES_TABLE(wxFrame) + WX_EVENT_PROPERTY( Menu , wxEVT_COMMAND_MENU_SELECTED , wxCommandEvent) + + WX_PROPERTY( Title,wxString, SetTitle, GetTitle, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + WX_PROPERTY_FLAGS( WindowStyle , wxFrameStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style + WX_PROPERTY( MenuBar , wxMenuBar * , SetMenuBar , GetMenuBar , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) +WX_END_PROPERTIES_TABLE() + +WX_BEGIN_HANDLERS_TABLE(wxFrame) +WX_END_HANDLERS_TABLE() + +WX_CONSTRUCTOR_6( wxFrame , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle) + +#else IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) +#endif // ============================================================================ // implementation @@ -106,9 +172,6 @@ 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; @@ -140,14 +203,6 @@ wxFrame::~wxFrame() { m_isBeingDeleted = TRUE; DeleteAllBars(); -#ifdef __WXWINCE__ - if (m_commandBar) - { - ::DestroyWindow((HWND) m_commandBar); - m_commandBar = NULL; - } -#endif - } // ---------------------------------------------------------------------------- @@ -275,6 +330,7 @@ void wxFrame::AttachMenuBar(wxMenuBar *menubar) } else // set new non NULL menu bar { +#ifndef __WXWINCE__ // Can set a menubar several times. if ( menubar->GetHMenu() ) { @@ -290,7 +346,7 @@ void wxFrame::AttachMenuBar(wxMenuBar *menubar) return; } } - +#endif InternalSetMenuBar(); } } @@ -300,25 +356,14 @@ void wxFrame::InternalSetMenuBar() #ifdef __WXMICROWIN__ // Nothing #elif defined(__WXWINCE__) - if (!m_commandBar) + + if (!GetToolBar()) { - // TODO: eventually have a wxCommandBar class - m_commandBar = (WXHWND) CommandBar_Create(wxGetInstance(), GetHwnd(), NewControlId()); - if (!m_commandBar) - { - wxFAIL_MSG( _T("failed to create commandbar") ); - return; - } - } - 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); + wxToolBar* toolBar = new wxToolBar(this, -1, + wxDefaultPosition, wxDefaultSize, + wxBORDER_NONE | wxTB_HORIZONTAL, + wxToolBarNameStr, GetMenuBar()); + SetToolBar(toolBar); } #else if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) ) @@ -445,6 +490,11 @@ bool wxFrame::ShowFullScreen(bool show, long style) wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) { +#ifdef __WXWINCE__ + // We may already have a toolbar from calling SetMenuBar. + if (GetToolBar()) + return GetToolBar(); +#endif if ( wxFrameBase::CreateToolBar(style, id, name) ) { PositionToolBar(); @@ -477,23 +527,63 @@ void wxFrame::PositionToolBar() } #endif // wxUSE_STATUSBAR + 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 = TRUE; + bool widthChanging = 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(0, 0, desiredW, desiredH, wxSIZE_NO_ADJUSTMENTS); + #endif // __WXWINCE__ } } @@ -802,6 +892,10 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) processed = HandlePaint(); break; + case WM_INITMENUPOPUP: + processed = HandleInitMenuPopup((WXHMENU) wParam); + break; + #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__) case WM_MENUSELECT: { @@ -813,10 +907,6 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) } break; - case WM_INITMENU: - processed = HandleInitMenu(); - break; - case WM_EXITMENULOOP: processed = HandleMenuLoop(wxEVT_MENU_CLOSE, wParam); break; @@ -839,13 +929,25 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) return rc; } -// handle WM_INITMENU message -bool wxFrame::HandleInitMenu() +// handle WM_INITMENUPOPUP message +bool wxFrame::HandleInitMenuPopup(WXHMENU hMenu) { - wxMenuEvent event(wxEVT_MENU_OPEN, 0); + wxMenu* menu = NULL; + if (GetMenuBar()) + { + int nCount = GetMenuBar()->GetMenuCount(); + for (int n = 0; n < nCount; n++) + { + if (GetMenuBar()->GetMenu(n)->GetHMenu() == hMenu) + { + menu = GetMenuBar()->GetMenu(n); + break; + } + } + } + + wxMenuEvent event(wxEVT_MENU_OPEN, 0, menu); event.SetEventObject(this); return GetEventHandler()->ProcessEvent(event); } - -