1. derive wxGTK wxRadioBox from wxRadioBoxBase now, as in all other ports

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

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 72ba895be88e9ab97db486ce46dfb91d66fa0920..b0ec95a99dc42256e66ed35cd3cf56afd0518841 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "mdi.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,7 +24,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_MDI_ARCHITECTURE && !defined(__WXUNIVERSAL__)
+#if wxUSE_MDI && !defined(__WXUNIVERSAL__)

 
 #ifndef WX_PRECOMP
     #include "wx/setup.h"
 
 #ifndef WX_PRECOMP
     #include "wx/setup.h"


@@ -45,6 +41,7 @@
     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

+#include "wx/stockitem.h"

 #include "wx/mdi.h"
 #include "wx/msw/private.h"
 
 #include "wx/mdi.h"
 #include "wx/msw/private.h"
 


@@ -62,7 +59,6 @@
 // global variables
 // ---------------------------------------------------------------------------
 
 // global variables
 // ---------------------------------------------------------------------------
 

-extern wxWindowList wxModelessWindows;      // from dialog.cpp

 extern wxMenu *wxCurrentPopupMenu;
 
 extern const wxChar *wxMDIFrameClassName;   // from app.cpp
 extern wxMenu *wxCurrentPopupMenu;
 
 extern const wxChar *wxMDIFrameClassName;   // from app.cpp


@@ -77,7 +73,6 @@ static HWND invalidHandle = 0;
 // constants
 // ---------------------------------------------------------------------------
 
 // constants
 // ---------------------------------------------------------------------------
 

-static const int IDM_WINDOWTILE  = 4001;

 static const int IDM_WINDOWTILEHOR  = 4001;
 static const int IDM_WINDOWCASCADE = 4002;
 static const int IDM_WINDOWICONS = 4003;
 static const int IDM_WINDOWTILEHOR  = 4001;
 static const int IDM_WINDOWCASCADE = 4002;
 static const int IDM_WINDOWICONS = 4003;


@@ -89,10 +84,6 @@ static const int IDM_WINDOWPREV = 4006;
 static const int wxFIRST_MDI_CHILD = 4100;
 static const int wxLAST_MDI_CHILD = 4600;
 
 static const int wxFIRST_MDI_CHILD = 4100;
 static const int wxLAST_MDI_CHILD = 4600;
 

-// Status border dimensions
-static const int wxTHICK_LINE_BORDER = 3;
-static const int wxTHICK_LINE_WIDTH  = 1;
-

 // ---------------------------------------------------------------------------
 // private functions
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // private functions
 // ---------------------------------------------------------------------------


@@ -139,6 +130,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
 
 BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
     EVT_SIZE(wxMDIParentFrame::OnSize)
 
 BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
     EVT_SIZE(wxMDIParentFrame::OnSize)

+    EVT_ICONIZE(wxMDIParentFrame::OnIconized)

     EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)
 END_EVENT_TABLE()
 
     EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)
 END_EVENT_TABLE()
 


@@ -204,7 +196,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
   if ( parent )
       parent->AddChild(this);
 
   if ( parent )
       parent->AddChild(this);
 

-  if ( id > -1 )
+  if ( id != wxID_ANY )

     m_windowId = id;
   else
     m_windowId = NewControlId();
     m_windowId = id;
   else
     m_windowId = NewControlId();


@@ -223,8 +215,6 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
       return false;
   }
 
       return false;
   }
 

-  wxModelessWindows.Append(this);
-

   // unlike (almost?) all other windows, frames are created hidden
   m_isShown = false;
 
   // unlike (almost?) all other windows, frames are created hidden
   m_isShown = false;
 


@@ -237,7 +227,9 @@ wxMDIParentFrame::~wxMDIParentFrame()
 #if wxUSE_TOOLBAR
     m_frameToolBar = NULL;
 #endif
 #if wxUSE_TOOLBAR
     m_frameToolBar = NULL;
 #endif

+#if wxUSE_STATUSBAR

     m_frameStatusBar = NULL;
     m_frameStatusBar = NULL;

+#endif // wxUSE_STATUSBAR

 
     DestroyChildren();
 
 
     DestroyChildren();
 


@@ -301,7 +293,35 @@ void wxMDIParentFrame::SetWindowMenu(wxMenu* menu)
     }
 }
 
     }
 }
 

-void wxMDIParentFrame::OnSize(wxSizeEvent&)
+void wxMDIParentFrame::DoMenuUpdates(wxMenu* menu)
+{
+    wxMDIChildFrame *child = GetActiveChild();
+    if ( child )
+    {
+        wxEvtHandler* source = child->GetEventHandler();
+        wxMenuBar* bar = child->GetMenuBar();
+
+        if (menu)
+        {
+            menu->UpdateUI(source);
+        }
+        else
+        {
+            if ( bar != NULL )
+            {
+                int nCount = bar->GetMenuCount();
+                for (int n = 0; n < nCount; n++)
+                    bar->GetMenu(n)->UpdateUI(source);
+            }
+        }
+    }
+    else
+    {
+        wxFrameBase::DoMenuUpdates(menu);
+    }
+}
+
+void wxMDIParentFrame::UpdateClientSize()

 {
     if ( GetClientWindow() )
     {
 {
     if ( GetClientWindow() )
     {


@@ -312,6 +332,23 @@ void wxMDIParentFrame::OnSize(wxSizeEvent&)
     }
 }
 
     }
 }
 

+void wxMDIParentFrame::OnSize(wxSizeEvent& WXUNUSED(event))
+{
+    UpdateClientSize();
+
+    // do not call event.Skip() here, it somehow messes up MDI client window
+}
+
+void wxMDIParentFrame::OnIconized(wxIconizeEvent& event)
+{
+    event.Skip();
+
+    if ( !event.Iconized() )
+    {
+        UpdateClientSize();
+    }
+}
+

 // Returns the active MDI child window
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 {
 // Returns the active MDI child window
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 {


@@ -357,10 +394,14 @@ void wxMDIParentFrame::Cascade()
     ::SendMessage(GetWinHwnd(GetClientWindow()), WM_MDICASCADE, 0, 0);
 }
 
     ::SendMessage(GetWinHwnd(GetClientWindow()), WM_MDICASCADE, 0, 0);
 }
 

-// TODO: add a direction argument (hor/vert)
-void wxMDIParentFrame::Tile()
+void wxMDIParentFrame::Tile(wxOrientation orient)

 {
 {

-    ::SendMessage(GetWinHwnd(GetClientWindow()), WM_MDITILE, MDITILE_HORIZONTAL, 0);
+    wxASSERT_MSG( orient == wxHORIZONTAL || orient == wxVERTICAL,
+                  _T("invalid orientation value") );
+
+    ::SendMessage(GetWinHwnd(GetClientWindow()), WM_MDITILE,
+                  orient == wxHORIZONTAL ? MDITILE_HORIZONTAL
+                                         : MDITILE_VERTICAL, 0);

 }
 
 void wxMDIParentFrame::ArrangeIcons()
 }
 
 void wxMDIParentFrame::ArrangeIcons()


@@ -459,9 +500,8 @@ WXLRESULT wxMDIParentFrame::MSWWindowProc(WXUINT message,
             break;
 
         case WM_SIZE:
             break;
 
         case WM_SIZE:

-            // as we don't (usually) resize the MDI client to exactly fit the
-            // client area (we put it below the toolbar, above statusbar &c),
-            // we should not pass this one to DefFrameProc
+            // though we don't (usually) resize the MDI client to exactly fit the
+            // client area we need to pass this one to DefFrameProc to allow the children to show

             break;
     }
 
             break;
     }
 


@@ -643,6 +683,7 @@ bool wxMDIParentFrame::MSWTranslateMessage(WXMSG* msg)
 void wxMDIChildFrame::Init()
 {
     m_needsResize = true;
 void wxMDIChildFrame::Init()
 {
     m_needsResize = true;

+    m_needsInitialShow = true;

 }
 
 bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 }
 
 bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,


@@ -654,9 +695,8 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
                              const wxString& name)
 {
   SetName(name);
                              const wxString& name)
 {
   SetName(name);

-  wxWindowBase::Show(true); // MDI child frame starts off shown

 
 

-  if ( id > -1 )
+  if ( id != wxID_ANY )

     m_windowId = id;
   else
     m_windowId = (int)NewControlId();
     m_windowId = id;
   else
     m_windowId = (int)NewControlId();


@@ -678,27 +718,27 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
                     : wxMDIChildFrameClassNameNoRedraw;
   mcs.szTitle = title;
   mcs.hOwner = wxGetInstance();
                     : wxMDIChildFrameClassNameNoRedraw;
   mcs.szTitle = title;
   mcs.hOwner = wxGetInstance();

-  if (x > -1)
+  if (x != wxDefaultCoord)

       mcs.x = x;
   else
       mcs.x = CW_USEDEFAULT;
 
       mcs.x = x;
   else
       mcs.x = CW_USEDEFAULT;
 

-  if (y > -1)
+  if (y != wxDefaultCoord)

       mcs.y = y;
   else
       mcs.y = CW_USEDEFAULT;
 
       mcs.y = y;
   else
       mcs.y = CW_USEDEFAULT;
 

-  if (width > -1)
+  if (width != wxDefaultCoord)

       mcs.cx = width;
   else
       mcs.cx = CW_USEDEFAULT;
 
       mcs.cx = width;
   else
       mcs.cx = CW_USEDEFAULT;
 

-  if (height > -1)
+  if (height != wxDefaultCoord)

       mcs.cy = height;
   else
       mcs.cy = CW_USEDEFAULT;
 
       mcs.cy = height;
   else
       mcs.cy = CW_USEDEFAULT;
 

-  DWORD msflags = WS_OVERLAPPED | WS_CLIPCHILDREN | WS_VISIBLE ;
+  DWORD msflags = WS_OVERLAPPED | WS_CLIPCHILDREN;

   if (style & wxMINIMIZE_BOX)
     msflags |= WS_MINIMIZEBOX;
   if (style & wxMAXIMIZE_BOX)
   if (style & wxMINIMIZE_BOX)
     msflags |= WS_MINIMIZEBOX;
   if (style & wxMAXIMIZE_BOX)


@@ -725,8 +765,6 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 
   wxAssociateWinWithHandle((HWND) GetHWND(), this);
 
 
   wxAssociateWinWithHandle((HWND) GetHWND(), this);
 

-  wxModelessWindows.Append(this);
-

   return true;
 }
 
   return true;
 }
 


@@ -737,7 +775,9 @@ wxMDIChildFrame::~wxMDIChildFrame()
 #if wxUSE_TOOLBAR
     m_frameToolBar = NULL;
 #endif
 #if wxUSE_TOOLBAR
     m_frameToolBar = NULL;
 #endif

+#if wxUSE_STATUSBAR

     m_frameStatusBar = NULL;
     m_frameStatusBar = NULL;

+#endif // wxUSE_STATUSBAR

 
     DestroyChildren();
 
 
     DestroyChildren();
 


@@ -746,8 +786,24 @@ wxMDIChildFrame::~wxMDIChildFrame()
     MSWDestroyWindow();
 }
 
     MSWDestroyWindow();
 }
 

+bool wxMDIChildFrame::Show(bool show)
+{
+    m_needsInitialShow = false;
+
+    if (!wxFrame::Show(show))
+        return false;
+
+    // KH: Without this call, new MDI children do not become active.
+    // This was added here after the same BringWindowToTop call was
+    // removed from wxTopLevelWindow::Show (November 2005)
+    if ( show )
+        ::BringWindowToTop(GetHwnd());
+
+    return true;
+}
+

 // Set the client size (i.e. leave the calculation of borders etc.
 // Set the client size (i.e. leave the calculation of borders etc.

-// to wxWindows)
+// to wxWidgets)

 void wxMDIChildFrame::DoSetClientSize(int width, int height)
 {
   HWND hWnd = GetHwnd();
 void wxMDIChildFrame::DoSetClientSize(int width, int height)
 {
   HWND hWnd = GetHwnd();


@@ -764,12 +820,14 @@ void wxMDIChildFrame::DoSetClientSize(int width, int height)
   int actual_width = rect2.right - rect2.left - rect.right + width;
   int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
 
   int actual_width = rect2.right - rect2.left - rect.right + width;
   int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
 

+#if wxUSE_STATUSBAR

   if (GetStatusBar() && GetStatusBar()->IsShown())
   {
     int sx, sy;
     GetStatusBar()->GetSize(&sx, &sy);
     actual_height += sy;
   }
   if (GetStatusBar() && GetStatusBar()->IsShown())
   {
     int sx, sy;
     GetStatusBar()->GetSize(&sx, &sy);
     actual_height += sy;
   }

+#endif // wxUSE_STATUSBAR

 
   POINT point;
   point.x = rect2.left;
 
   POINT point;
   point.x = rect2.left;


@@ -782,7 +840,8 @@ void wxMDIChildFrame::DoSetClientSize(int width, int height)
 
   MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)true);
 
 
   MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)true);
 

-  wxSizeEvent event(wxSize(width, height), m_windowId);
+  wxSize size(width, height);
+  wxSizeEvent event(size, m_windowId);

   event.SetEventObject( this );
   GetEventHandler()->ProcessEvent(event);
 }
   event.SetEventObject( this );
   GetEventHandler()->ProcessEvent(event);
 }


@@ -800,8 +859,10 @@ void wxMDIChildFrame::DoGetPosition(int *x, int *y) const
   wxMDIParentFrame *mdiParent = (wxMDIParentFrame *)GetParent();
   ::ScreenToClient((HWND) mdiParent->GetClientWindow()->GetHWND(), &point);
 
   wxMDIParentFrame *mdiParent = (wxMDIParentFrame *)GetParent();
   ::ScreenToClient((HWND) mdiParent->GetClientWindow()->GetHWND(), &point);
 

-  *x = point.x;
-  *y = point.y;
+  if (x)
+      *x = point.x;
+  if (y)
+      *y = point.y;

 }
 
 void wxMDIChildFrame::InternalSetMenuBar()
 }
 
 void wxMDIChildFrame::InternalSetMenuBar()


@@ -814,6 +875,12 @@ void wxMDIChildFrame::InternalSetMenuBar()
     parent->m_parentFrameActive = false;
 }
 
     parent->m_parentFrameActive = false;
 }
 

+void wxMDIChildFrame::DetachMenuBar()
+{
+    RemoveWindowMenu(NULL, m_hMenu);
+    wxFrame::DetachMenuBar();
+}
+

 WXHICON wxMDIChildFrame::GetDefaultIcon() const
 {
     // we don't have any standard icons (any more)
 WXHICON wxMDIChildFrame::GetDefaultIcon() const
 {
     // we don't have any standard icons (any more)


@@ -1243,11 +1310,11 @@ void wxMDIClientWindow::DoSetSize(int x, int y, int width, int height, int sizeF
     // (see OGL studio sample). So check if the position is changed and if so,
     // redraw the MDI child frames.
 
     // (see OGL studio sample). So check if the position is changed and if so,
     // redraw the MDI child frames.
 

-    wxPoint oldPos = GetPosition();
+    const wxPoint oldPos = GetPosition();

 
 

-    wxWindow::DoSetSize(x, y, width, height, sizeFlags);
+    wxWindow::DoSetSize(x, y, width, height, sizeFlags | wxSIZE_FORCE);

 
 

-    wxPoint newPos = GetPosition();
+    const wxPoint newPos = GetPosition();

 
     if ((newPos.x != oldPos.x) || (newPos.y != oldPos.y))
     {
 
     if ((newPos.x != oldPos.x) || (newPos.y != oldPos.y))
     {


@@ -1274,6 +1341,16 @@ void wxMDIClientWindow::DoSetSize(int x, int y, int width, int height, int sizeF
 
 void wxMDIChildFrame::OnIdle(wxIdleEvent& event)
 {
 
 void wxMDIChildFrame::OnIdle(wxIdleEvent& event)
 {

+    // wxMSW prior to 2.5.3 created MDI child frames as visible, which resulted
+    // in flicker e.g. when the frame contained controls with non-trivial
+    // layout. Since 2.5.3, the frame is created hidden as all other top level
+    // windows. In order to maintain backward compatibility, the frame is shown
+    // in OnIdle, unless Show(false) was called by the programmer before.
+    if ( m_needsInitialShow )
+    {
+        Show(true);
+    }
+

     // MDI child frames get their WM_SIZE when they're constructed but at this
     // moment they don't have any children yet so all child windows will be
     // positioned incorrectly when they are added later - to fix this, we
     // MDI child frames get their WM_SIZE when they're constructed but at this
     // moment they don't have any children yet so all child windows will be
     // positioned incorrectly when they are added later - to fix this, we


@@ -1331,7 +1408,8 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu)
                 continue;
             }
 
                 continue;
             }
 

-            if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_("Help")) )
+            wxString strBuf(buf);
+            if ( wxStripMenuCodes(strBuf) == wxGetStockLabel(wxID_HELP,false) )

             {
                 success = true;
                 ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING,
             {
                 success = true;
                 ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING,


@@ -1399,6 +1477,5 @@ static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
     *hwndDeact = (WXHWND)wParam;
 }
 
     *hwndDeact = (WXHWND)wParam;
 }
 

-#endif
-// wxUSE_MDI_ARCHITECTURE && !defined(__WXUNIVERSAL__)
+#endif // wxUSE_MDI && !defined(__WXUNIVERSAL__)