having the refcon of a menu item to bear the pointer to the wxMenuItem, and have...

[wxWidgets.git] / src / msw / frame.cpp

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 438db56ff0e83b1cf8a90b470c651052750fa547..6c412d00f09ee962a14fa1b2ff176d0e8fa87c54 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -82,70 +82,66 @@ END_EVENT_TABLE()
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxFrameStyle )
 
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxFrameStyle )
 

-WX_BEGIN_FLAGS( wxFrameStyle )
+wxBEGIN_FLAGS( wxFrameStyle )

     // new style border flags, we put them first to
     // use them for streaming out
     // 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)
+    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
     
     // 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)
+    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
 
     // 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)
+    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
 
     // 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)
+    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)

 
 

-    WX_FLAGS_MEMBER(wxFRAME_TOOL_WINDOW)
-    WX_FLAGS_MEMBER(wxFRAME_FLOAT_ON_PARENT)
+    wxFLAGS_MEMBER(wxFRAME_TOOL_WINDOW)
+    wxFLAGS_MEMBER(wxFRAME_FLOAT_ON_PARENT)

 
 

-    WX_FLAGS_MEMBER(wxFRAME_SHAPED)
+    wxFLAGS_MEMBER(wxFRAME_SHAPED)

 
 

-WX_END_FLAGS( wxFrameStyle )
+wxEND_FLAGS( wxFrameStyle )

 
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxFrame, wxTopLevelWindow,"wx/frame.h")
 
 
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxFrame, wxTopLevelWindow,"wx/frame.h")
 

-WX_BEGIN_PROPERTIES_TABLE(wxFrame)
-       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"))
-    /*
-       TODO PROPERTIES
+wxBEGIN_PROPERTIES_TABLE(wxFrame)
+       wxEVENT_PROPERTY( Menu , wxEVT_COMMAND_MENU_SELECTED , wxCommandEvent)

 
 

-               style (wxDEFAULT_FRAME_STYLE)
-               centered (bool, false )
-*/
-WX_END_PROPERTIES_TABLE()
+    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()

 
 

-WX_BEGIN_HANDLERS_TABLE(wxFrame)
-WX_END_HANDLERS_TABLE()
+wxBEGIN_HANDLERS_TABLE(wxFrame)
+wxEND_HANDLERS_TABLE()

 
 

-WX_CONSTRUCTOR_6( wxFrame , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle) 
+wxCONSTRUCTOR_6( wxFrame , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle) 

 
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
 
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)


@@ -198,8 +194,6 @@ bool wxFrame::Create(wxWindow *parent,
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
 
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
 

-    wxModelessWindows.Append(this);
-

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -324,6 +318,32 @@ void wxFrame::PositionStatusBar()
 
 void wxFrame::AttachMenuBar(wxMenuBar *menubar)
 {
 
 void wxFrame::AttachMenuBar(wxMenuBar *menubar)
 {

+#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(__POCKETPC__) || defined(__SMARTPHONE__))
+    if (!GetToolBar())
+    {
+        wxToolBar* toolBar = new wxToolBar(this, -1,
+                         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 )
     wxFrameBase::AttachMenuBar(menubar);
 
     if ( !menubar )


@@ -334,7 +354,7 @@ void wxFrame::AttachMenuBar(wxMenuBar *menubar)
     }
     else // set new non NULL menu bar
     {
     }
     else // set new non NULL menu bar
     {

-#ifndef __WXWINCE__
+#if !defined(__WXWINCE__) || (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__))

         // Can set a menubar several times.
         if ( menubar->GetHMenu() )
         {
         // Can set a menubar several times.
         if ( menubar->GetHMenu() )
         {


@@ -357,18 +377,8 @@ void wxFrame::AttachMenuBar(wxMenuBar *menubar)
 
 void wxFrame::InternalSetMenuBar()
 {
 
 void wxFrame::InternalSetMenuBar()
 {

-#ifdef __WXMICROWIN__
+#if defined(__WXMICROWIN__) || defined(__WXWINCE__)

     // Nothing
     // Nothing

-#elif defined(__WXWINCE__)
-
-    if (!GetToolBar())
-    {
-        wxToolBar* toolBar = new wxToolBar(this, -1,
-                         wxDefaultPosition, wxDefaultSize,
-                         wxBORDER_NONE | wxTB_HORIZONTAL,
-                         wxToolBarNameStr, GetMenuBar());
-        SetToolBar(toolBar);
-    }

 #else
     if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) )
     {
 #else
     if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) )
     {


@@ -407,7 +417,7 @@ bool wxFrame::ShowFullScreen(bool show, long style)
     if (show)
     {
 #if wxUSE_TOOLBAR
     if (show)
     {
 #if wxUSE_TOOLBAR

-#ifdef __WXWINCE__
+#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(__POCKETPC__) || defined(__SMARTPHONE__))

         // TODO: hide commandbar
 #else
         wxToolBar *theToolBar = GetToolBar();
         // TODO: hide commandbar
 #else
         wxToolBar *theToolBar = GetToolBar();


@@ -424,8 +434,10 @@ bool wxFrame::ShowFullScreen(bool show, long style)
 #endif // __WXWINCE__
 #endif // wxUSE_TOOLBAR
 
 #endif // __WXWINCE__
 #endif // wxUSE_TOOLBAR
 

+#if defined(__WXMICROWIN__)
+#elif defined(__WXWINCE__)

         // TODO: make it work for WinCE
         // TODO: make it work for WinCE

-#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+#else

         if (style & wxFULLSCREEN_NOMENUBAR)
             SetMenu((HWND)GetHWND(), (HMENU) NULL);
 #endif
         if (style & wxFULLSCREEN_NOMENUBAR)
             SetMenu((HWND)GetHWND(), (HMENU) NULL);
 #endif


@@ -450,7 +462,7 @@ bool wxFrame::ShowFullScreen(bool show, long style)
     else
     {
 #if wxUSE_TOOLBAR
     else
     {
 #if wxUSE_TOOLBAR

-#ifdef __WXWINCE__
+#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(__POCKETPC__) || defined(__SMARTPHONE__))

         // TODO: show commandbar
 #else
         wxToolBar *theToolBar = GetToolBar();
         // TODO: show commandbar
 #else
         wxToolBar *theToolBar = GetToolBar();


@@ -476,8 +488,10 @@ bool wxFrame::ShowFullScreen(bool show, long style)
         }
 #endif // wxUSE_STATUSBAR
 
         }
 #endif // wxUSE_STATUSBAR
 

+#if defined(__WXMICROWIN__)
+#elif defined(__WXWINCE__)

         // TODO: make it work for WinCE
         // 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
         if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
             SetMenu((HWND)GetHWND(), (HMENU)m_hMenu);
 #endif


@@ -494,7 +508,7 @@ bool wxFrame::ShowFullScreen(bool show, long style)
 
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
 
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {

-#ifdef __WXWINCE__
+#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(__POCKETPC__) || defined(__SMARTPHONE__))

     // We may already have a toolbar from calling SetMenuBar.
     if (GetToolBar())
         return GetToolBar();
     // We may already have a toolbar from calling SetMenuBar.
     if (GetToolBar())
         return GetToolBar();


@@ -512,7 +526,7 @@ void wxFrame::PositionToolBar()
     wxToolBar *toolbar = GetToolBar();
     if ( toolbar && toolbar->IsShown() )
     {
     wxToolBar *toolbar = GetToolBar();
     if ( toolbar && toolbar->IsShown() )
     {

-#ifdef __WXWINCE__
+#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(__POCKETPC__) || defined(__SMARTPHONE__))

         // We want to do something different in WinCE, because
         // the toolbar should be associated with the commandbar,
         // and not an independent window.
         // We want to do something different in WinCE, because
         // the toolbar should be associated with the commandbar,
         // and not an independent window.


@@ -531,6 +545,18 @@ void wxFrame::PositionToolBar()
         }
 #endif // wxUSE_STATUSBAR
 
         }
 #endif // wxUSE_STATUSBAR
 

+               int x = 0;
+               int y = 0;
+#if defined(__WXWINCE__)
+               // 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);
         int tx, ty;
         int tw, th;
         toolbar->GetPosition(&tx, &ty);


@@ -586,7 +612,7 @@ void wxFrame::PositionToolBar()
         }
         
         if (tx != 0 || ty != 0 || widthChanging || heightChanging)
         }
         
         if (tx != 0 || ty != 0 || widthChanging || heightChanging)

-            toolbar->SetSize(0, 0, desiredW, desiredH, wxSIZE_NO_ADJUSTMENTS);
+            toolbar->SetSize(x, y, desiredW, desiredH, wxSIZE_NO_ADJUSTMENTS);

         
 #endif // __WXWINCE__
     }
         
 #endif // __WXWINCE__
     }


@@ -634,14 +660,12 @@ void wxFrame::IconizeChildFrames(bool bIconize)
             // restoring it
             if ( 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);
         }
     }
                 frame->Iconize(bIconize);
         }
     }


@@ -781,6 +805,23 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id)
         PositionToolBar();
 #endif // wxUSE_TOOLBAR
 
         PositionToolBar();
 #endif // wxUSE_TOOLBAR
 

+#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__))
+               // 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);
     }
 
         processed = wxWindow::HandleSize(x, y, id);
     }
 


@@ -864,9 +905,9 @@ bool wxFrame::HandleMenuLoop(const wxEventType& evtType, WXWORD isPopup)
 // the window proc for wxFrame
 // ---------------------------------------------------------------------------
 
 // 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;
+    WXLRESULT rc = 0;

     bool processed = FALSE;
 
     switch ( message )
     bool processed = FALSE;
 
     switch ( message )


@@ -955,3 +996,45 @@ bool wxFrame::HandleInitMenuPopup(WXHMENU hMenu)
 
     return GetEventHandler()->ProcessEvent(event);
 }
 
     return GetEventHandler()->ProcessEvent(event);
 }

+
+// ----------------------------------------------------------------------------
+// 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
+{
+    wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();
+
+#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__) && \
+  (!defined(__WXWINCE__) || (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)))
+    wxToolBar *toolbar = GetToolBar();
+    if ( toolbar && toolbar->IsShown() )
+    {
+        int w, h;
+        toolbar->GetSize(&w, &h);
+
+        if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
+        {
+            pt.x += w;
+        }
+        else
+        {
+            pt.y += h;
+        }
+    }
+#endif // wxUSE_TOOLBAR
+
+#if defined(__WXWINCE__) && defined(__WINCE_STANDARDSDK__)
+       if (GetMenuBar() && GetMenuBar()->GetCommandBar())
+       {
+               RECT rect;
+               ::GetWindowRect((HWND) GetMenuBar()->GetCommandBar(), &rect);
+               pt.y += (rect.bottom - rect.top);
+       }
+#endif
+
+    return pt;
+}