added missing -univ package control files.

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 6723824373f2678d3f4deef7d399245ddf04e63e..13946cb04e34d9551c746b5405758201999fed7c 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        msw/frame.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        msw/frame.cpp

-// Purpose:     wxFrame
+// Purpose:     wxFrameMSW

 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97


@@ -29,10 +29,9 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include "wx/setup.h"

     #include "wx/frame.h"
     #include "wx/frame.h"

-    #include "wx/menu.h"

     #include "wx/app.h"
     #include "wx/app.h"

+    #include "wx/menu.h"

     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"


@@ -55,25 +54,33 @@
 #include "wx/menuitem.h"
 #include "wx/log.h"
 
 #include "wx/menuitem.h"
 #include "wx/log.h"
 

+#ifdef __WXUNIVERSAL__
+    #include "wx/univ/theme.h"
+    #include "wx/univ/colschem.h"
+#endif // __WXUNIVERSAL__
+

 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 

-extern wxWindowList wxModelessWindows;
-extern wxList WXDLLEXPORT wxPendingDelete;

 extern const wxChar *wxFrameClassName;
 extern const wxChar *wxFrameClassName;

+
+#if wxUSE_MENUS_NATIVE

 extern wxMenu *wxCurrentPopupMenu;
 extern wxMenu *wxCurrentPopupMenu;

+#endif // wxUSE_MENUS_NATIVE

 
 // ----------------------------------------------------------------------------
 // event tables
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // event tables
 // ----------------------------------------------------------------------------
 

-BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
-    EVT_ACTIVATE(wxFrame::OnActivate)
-    EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
+BEGIN_EVENT_TABLE(wxFrameMSW, wxFrameBase)
+    EVT_ACTIVATE(wxFrameMSW::OnActivate)
+    EVT_SYS_COLOUR_CHANGED(wxFrameMSW::OnSysColourChanged)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
+#ifndef __WXUNIVERSAL__
+    IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
+#endif

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -83,20 +90,20 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 // static class members
 // ----------------------------------------------------------------------------
 
 // static class members
 // ----------------------------------------------------------------------------
 

-#if wxUSE_NATIVE_STATUSBAR
-    bool wxFrame::m_useNativeStatusBar = TRUE;
-#else
-    bool wxFrame::m_useNativeStatusBar = FALSE;
-#endif
+#if wxUSE_STATUSBAR
+    #if wxUSE_NATIVE_STATUSBAR
+        bool wxFrameMSW::m_useNativeStatusBar = TRUE;
+    #else
+        bool wxFrameMSW::m_useNativeStatusBar = FALSE;
+    #endif
+#endif // wxUSE_NATIVE_STATUSBAR

 
 // ----------------------------------------------------------------------------
 // creation/destruction
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // creation/destruction
 // ----------------------------------------------------------------------------
 

-void wxFrame::Init()
+void wxFrameMSW::Init()

 {
 {

-    m_iconized = FALSE;
-

 #if wxUSE_TOOLTIPS
     m_hwndToolTip = 0;
 #endif
 #if wxUSE_TOOLTIPS
     m_hwndToolTip = 0;
 #endif


@@ -117,7 +124,7 @@ void wxFrame::Init()
     m_isShown = FALSE;
 }
 
     m_isShown = FALSE;
 }
 

-bool wxFrame::Create(wxWindow *parent,
+bool wxFrameMSW::Create(wxWindow *parent,

                      wxWindowID id,
                      const wxString& title,
                      const wxPoint& pos,
                      wxWindowID id,
                      const wxString& title,
                      const wxPoint& pos,


@@ -125,72 +132,32 @@ bool wxFrame::Create(wxWindow *parent,
                      long style,
                      const wxString& name)
 {
                      long style,
                      const wxString& name)
 {

-  SetName(name);
-  m_windowStyle = style;
-  m_frameMenuBar = NULL;
-  m_frameToolBar = NULL;
-  m_frameStatusBar = NULL;
-
-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
-
-  if ( id > -1 )
-    m_windowId = id;
-  else
-    m_windowId = (int)NewControlId();
-
-  if (parent) parent->AddChild(this);
-
-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
-
-  m_iconized = FALSE;
+    if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+        return FALSE;

 
 

-  wxTopLevelWindows.Append(this);
+    // the frame must have NULL parent HWND or it would be always on top of its
+    // parent which is not what we usually want (in fact, we only want it for
+    // frames with the special wxFRAME_TOOL_WINDOW style handled elsewhere)
+    if ( !MSWCreate(m_windowId, NULL, wxFrameClassName, this, title,
+                    pos.x, pos.y, size.x, size.y, style) )
+        return FALSE;

 
 

-  MSWCreate(m_windowId, parent, wxFrameClassName, this, title,
-            x, y, width, height, style);
+    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));

 
 

-  wxModelessWindows.Append(this);
+    wxModelessWindows.Append(this);

 
 

-  return TRUE;
+    return TRUE;

 }
 
 }
 

-wxFrame::~wxFrame()
+wxFrameMSW::~wxFrameMSW()

 {
 {

-  m_isBeingDeleted = TRUE;
-  wxTopLevelWindows.DeleteObject(this);
-
-  // the ~wxToolBar() code relies on the previous line to be executed before
-  // this one, i.e. the frame should remove itself from wxTopLevelWindows
-  // before destorying its toolbar
-  DeleteAllBars();
-
-  if (wxTheApp && (wxTopLevelWindows.Number() == 0))
-  {
-    wxTheApp->SetTopWindow(NULL);
-
-    if (wxTheApp->GetExitOnFrameDelete())
-    {
-       PostQuitMessage(0);
-    }
-  }
-
-  wxModelessWindows.DeleteObject(this);
+    m_isBeingDeleted = TRUE;

 
 

-  // For some reason, wxWindows can activate another task altogether
-  // when a frame is destroyed after a modal dialog has been invoked.
-  // Try to bring the parent to the top.
-  // MT:Only do this if this frame is currently the active window, else weird
-  // things start to happen
-  if ( wxGetActiveWindow() == this )
-  if (GetParent() && GetParent()->GetHWND())
-    ::BringWindowToTop((HWND) GetParent()->GetHWND());
+    DeleteAllBars();

 }
 
 // Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.
 }
 
 // Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.

-void wxFrame::DoGetClientSize(int *x, int *y) const
+void wxFrameMSW::DoGetClientSize(int *x, int *y) const

 {
   RECT rect;
   ::GetClientRect(GetHwnd(), &rect);
 {
   RECT rect;
   ::GetClientRect(GetHwnd(), &rect);


@@ -214,164 +181,41 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
     *y = rect.bottom;
 }
 
     *y = rect.bottom;
 }
 

-// Set the client size (i.e. leave the calculation of borders etc.
-// to wxWindows)
-void wxFrame::DoSetClientSize(int width, int height)
+void wxFrameMSW::DoSetClientSize(int width, int height)

 {
 {

-  HWND hWnd = GetHwnd();
-
-  RECT rect;
-  ::GetClientRect(hWnd, &rect);
-
-  RECT rect2;
-  GetWindowRect(hWnd, &rect2);
-
-  // Find the difference between the entire window (title bar and all)
-  // and the client area; add this to the new client size to move the
-  // window
-  int actual_width = rect2.right - rect2.left - rect.right + width;
-  int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
-
+    // leave enough space for the status bar if we have (and show) it

 #if wxUSE_STATUSBAR
 #if wxUSE_STATUSBAR

-  if ( GetStatusBar() && GetStatusBar()->IsShown())
-  {
-    int statusX, statusY;
-    GetStatusBar()->GetClientSize(&statusX, &statusY);
-    actual_height += statusY;
-  }
+    wxStatusBar *statbar = GetStatusBar();
+    if ( statbar && statbar->IsShown() )
+    {
+        height += statbar->GetSize().y;
+    }

 #endif // wxUSE_STATUSBAR
 
 #endif // wxUSE_STATUSBAR
 

-  wxPoint pt(GetClientAreaOrigin());
-  actual_width += pt.y;
-  actual_height += pt.x;
-
-  POINT point;
-  point.x = rect2.left;
-  point.y = rect2.top;
-
-  MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)TRUE);
-
-  wxSizeEvent event(wxSize(width, height), m_windowId);
-  event.SetEventObject( this );
-  GetEventHandler()->ProcessEvent(event);
-}
-
-void wxFrame::DoGetSize(int *width, int *height) const
-{
-  RECT rect;
-  GetWindowRect(GetHwnd(), &rect);
-  *width = rect.right - rect.left;
-  *height = rect.bottom - rect.top;
-}
-
-void wxFrame::DoGetPosition(int *x, int *y) const
-{
-  RECT rect;
-  GetWindowRect(GetHwnd(), &rect);
-  POINT point;
-  point.x = rect.left;
-  point.y = rect.top;
-
-  *x = point.x;
-  *y = point.y;
+    wxTopLevelWindow::DoSetClientSize(width, height);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// variations around ::ShowWindow()
+// wxFrameMSW: various geometry-related functions

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void wxFrame::DoShowWindow(int nShowCmd)
-{
-    ::ShowWindow(GetHwnd(), nShowCmd);
-
-    m_iconized = nShowCmd == SW_MINIMIZE;
-}
-
-bool wxFrame::Show(bool show)
-{
-    // don't use wxWindow version as we want to call DoShowWindow()
-    if ( !wxWindowBase::Show(show) )
-        return FALSE;
-
-    DoShowWindow(show ? SW_SHOW : SW_HIDE);
-
-    if ( show )
-    {
-        ::BringWindowToTop(GetHwnd());
-
-        wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_windowId);
-        event.SetEventObject( this );
-        GetEventHandler()->ProcessEvent(event);
-    }
-    else
-    {
-        // Try to highlight the correct window (the parent)
-        if ( GetParent() )
-        {
-            HWND hWndParent = GetHwndOf(GetParent());
-            if (hWndParent)
-                ::BringWindowToTop(hWndParent);
-        }
-    }
-
-    return TRUE;
-}
-
-void wxFrame::Iconize(bool iconize)
-{
-    DoShowWindow(iconize ? SW_MINIMIZE : SW_RESTORE);
-}
-
-void wxFrame::Maximize(bool maximize)
-{
-    DoShowWindow(maximize ? SW_MAXIMIZE : SW_RESTORE);
-}
-
-void wxFrame::Restore()
-{
-    DoShowWindow(SW_RESTORE);
-}
-
-bool wxFrame::IsIconized() const
-{
-  ((wxFrame *)this)->m_iconized = (::IsIconic(GetHwnd()) != 0);
-  return m_iconized;
-}
-
-// Is it maximized?
-bool wxFrame::IsMaximized() const
+void wxFrameMSW::Raise()

 {
 {

-    return (::IsZoomed(GetHwnd()) != 0);
-}
-
-void wxFrame::SetIcon(const wxIcon& icon)
-{
-    wxFrameBase::SetIcon(icon);
-
-#if defined(__WIN95__)
-    if ( m_icon.Ok() )
-    {
-        SendMessage(GetHwnd(), WM_SETICON,
-                    (WPARAM)TRUE, (LPARAM)(HICON) m_icon.GetHICON());
-    }
-#endif // __WIN95__
+#ifdef __WIN16__
+    // no SetForegroundWindow() in Win16
+    wxFrameBase::Raise();
+#else // Win32
+    ::SetForegroundWindow(GetHwnd());
+#endif // Win16/32

 }
 
 // generate an artificial resize event
 }
 
 // generate an artificial resize event

-void wxFrame::SendSizeEvent()
+void wxFrameMSW::SendSizeEvent()

 {
 {

-    RECT r;
-#ifdef __WIN16__
-    ::GetWindowRect(GetHwnd(), &r);
-#else
-    if ( !::GetWindowRect(GetHwnd(), &r) )
-    {
-        wxLogLastError(_T("GetWindowRect"));
-    }
-#endif
-

     if ( !m_iconized )
     {
     if ( !m_iconized )
     {

+        RECT r = wxGetWindowRect(GetHwnd());
+

         (void)::PostMessage(GetHwnd(), WM_SIZE,
                             IsMaximized() ? SIZE_MAXIMIZED : SIZE_RESTORED,
                             MAKELPARAM(r.right - r.left, r.bottom - r.top));
         (void)::PostMessage(GetHwnd(), WM_SIZE,
                             IsMaximized() ? SIZE_MAXIMIZED : SIZE_RESTORED,
                             MAKELPARAM(r.right - r.left, r.bottom - r.top));


@@ -379,7 +223,7 @@ void wxFrame::SendSizeEvent()
 }
 
 #if wxUSE_STATUSBAR
 }
 
 #if wxUSE_STATUSBAR

-wxStatusBar *wxFrame::OnCreateStatusBar(int number,
+wxStatusBar *wxFrameMSW::OnCreateStatusBar(int number,

                                         long style,
                                         wxWindowID id,
                                         const wxString& name)
                                         long style,
                                         wxWindowID id,
                                         const wxString& name)


@@ -413,7 +257,7 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number,
     return statusBar;
 }
 
     return statusBar;
 }
 

-void wxFrame::PositionStatusBar()
+void wxFrameMSW::PositionStatusBar()

 {
     if ( !m_frameStatusBar )
         return;
 {
     if ( !m_frameStatusBar )
         return;


@@ -429,81 +273,73 @@ void wxFrame::PositionStatusBar()
 }
 #endif // wxUSE_STATUSBAR
 
 }
 #endif // wxUSE_STATUSBAR
 

-void wxFrame::DetachMenuBar()
-{
-    if ( m_frameMenuBar )
-    {
-        m_frameMenuBar->Detach();
-        m_frameMenuBar = NULL;
-    }
-}
+#if wxUSE_MENUS_NATIVE

 
 

-void wxFrame::SetMenuBar(wxMenuBar *menubar)
+void wxFrameMSW::AttachMenuBar(wxMenuBar *menubar)

 {
 {

+    wxFrameBase::AttachMenuBar(menubar);
+

     if ( !menubar )
     {
     if ( !menubar )
     {

-        DetachMenuBar();
-

         // actually remove the menu from the frame
         m_hMenu = (WXHMENU)0;
         InternalSetMenuBar();
     }
     else // set new non NULL menu bar
     {
         // actually remove the menu from the frame
         m_hMenu = (WXHMENU)0;
         InternalSetMenuBar();
     }
     else // set new non NULL menu bar
     {

-        m_frameMenuBar = NULL;
-

         // Can set a menubar several times.
         // Can set a menubar several times.

-        // TODO: how to prevent a memory leak if you have a currently-unattached
-        // menubar? wxWindows assumes that the frame will delete the menu (otherwise
-        // there are problems for MDI).

         if ( menubar->GetHMenu() )
         {
             m_hMenu = menubar->GetHMenu();
         }
         if ( menubar->GetHMenu() )
         {
             m_hMenu = menubar->GetHMenu();
         }

-        else
+        else // no HMENU yet

         {
         {

-            menubar->Detach();
-

             m_hMenu = menubar->Create();
 
             if ( !m_hMenu )
             m_hMenu = menubar->Create();
 
             if ( !m_hMenu )

+            {
+                wxFAIL_MSG( _T("failed to create menu bar") );

                 return;
                 return;

+            }

         }
 
         InternalSetMenuBar();
         }
 
         InternalSetMenuBar();

-
-        m_frameMenuBar = menubar;
-        menubar->Attach(this);

     }
 }
 
     }
 }
 

-void wxFrame::InternalSetMenuBar()
+void wxFrameMSW::InternalSetMenuBar()

 {
 {

+#ifndef __WXMICROWIN__

     if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) )
     {
         wxLogLastError(wxT("SetMenu"));
     }
     if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) )
     {
         wxLogLastError(wxT("SetMenu"));
     }

+#endif

 }
 
 }
 

+#endif // wxUSE_MENUS_NATIVE
+

 // Responds to colour changes, and passes event on to children.
 // Responds to colour changes, and passes event on to children.

-void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
+void wxFrameMSW::OnSysColourChanged(wxSysColourChangedEvent& event)

 {
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
     Refresh();
 
 {
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
     Refresh();
 

+#if wxUSE_STATUSBAR

     if ( m_frameStatusBar )
     {
         wxSysColourChangedEvent event2;
         event2.SetEventObject( m_frameStatusBar );
         m_frameStatusBar->GetEventHandler()->ProcessEvent(event2);
     }
     if ( m_frameStatusBar )
     {
         wxSysColourChangedEvent event2;
         event2.SetEventObject( m_frameStatusBar );
         m_frameStatusBar->GetEventHandler()->ProcessEvent(event2);
     }

+#endif // wxUSE_STATUSBAR

 
     // Propagate the event to the non-top-level children
     wxWindow::OnSysColourChanged(event);
 }
 
 // Pass TRUE to show full screen, FALSE to restore.
 
     // Propagate the event to the non-top-level children
     wxWindow::OnSysColourChanged(event);
 }
 
 // Pass TRUE to show full screen, FALSE to restore.

-bool wxFrame::ShowFullScreen(bool show, long style)
+bool wxFrameMSW::ShowFullScreen(bool show, long style)

 {
     if (show)
     {
 {
     if (show)
     {


@@ -513,15 +349,10 @@ bool wxFrame::ShowFullScreen(bool show, long style)
         m_fsIsShowing = TRUE;
         m_fsStyle = style;
 
         m_fsIsShowing = TRUE;
         m_fsStyle = style;
 

+#if wxUSE_TOOLBAR

         wxToolBar *theToolBar = GetToolBar();
         wxToolBar *theToolBar = GetToolBar();

-        wxStatusBar *theStatusBar = GetStatusBar();
-
-        int dummyWidth;
-

         if (theToolBar)
         if (theToolBar)

-            theToolBar->GetSize(&dummyWidth, &m_fsToolBarHeight);
-        if (theStatusBar)
-            theStatusBar->GetSize(&dummyWidth, &m_fsStatusBarHeight);
+            theToolBar->GetSize(NULL, &m_fsToolBarHeight);

 
         // zap the toolbar, menubar, and statusbar
 
 
         // zap the toolbar, menubar, and statusbar
 


@@ -530,9 +361,17 @@ bool wxFrame::ShowFullScreen(bool show, long style)
             theToolBar->SetSize(-1,0);
             theToolBar->Show(FALSE);
         }
             theToolBar->SetSize(-1,0);
             theToolBar->Show(FALSE);
         }

+#endif // wxUSE_TOOLBAR

 
 

+#ifndef __WXMICROWIN__

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

+#endif
+
+#if wxUSE_STATUSBAR
+        wxStatusBar *theStatusBar = GetStatusBar();
+        if (theStatusBar)
+            theStatusBar->GetSize(NULL, &m_fsStatusBarHeight);

 
         // Save the number of fields in the statusbar
         if ((style & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar)
 
         // Save the number of fields in the statusbar
         if ((style & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar)


@@ -544,6 +383,7 @@ bool wxFrame::ShowFullScreen(bool show, long style)
         }
         else
             m_fsStatusBarFields = 0;
         }
         else
             m_fsStatusBarFields = 0;

+#endif // wxUSE_STATUSBAR

 
         // zap the frame borders
 
 
         // zap the frame borders
 


@@ -559,20 +399,19 @@ bool wxFrame::ShowFullScreen(bool show, long style)
         LONG offFlags = 0;
 
         if (style & wxFULLSCREEN_NOBORDER)
         LONG offFlags = 0;
 
         if (style & wxFULLSCREEN_NOBORDER)

-            offFlags |= WS_BORDER;
+            offFlags |= WS_BORDER | WS_THICKFRAME;

         if (style & wxFULLSCREEN_NOCAPTION)
             offFlags |= (WS_CAPTION | WS_SYSMENU);
 
         newStyle &= (~offFlags);
 
         // change our window style to be compatible with full-screen mode
         if (style & wxFULLSCREEN_NOCAPTION)
             offFlags |= (WS_CAPTION | WS_SYSMENU);
 
         newStyle &= (~offFlags);
 
         // change our window style to be compatible with full-screen mode

-        SetWindowLong((HWND)GetHWND(), GWL_STYLE, newStyle);
+        ::SetWindowLong((HWND)GetHWND(), GWL_STYLE, newStyle);

 
         // resize to the size of the desktop
         int width, height;
 
 
         // resize to the size of the desktop
         int width, height;
 

-        RECT rect;
-        ::GetWindowRect(GetDesktopWindow(), &rect);
+        RECT rect = wxGetWindowRect(::GetDesktopWindow());

         width = rect.right - rect.left;
         height = rect.bottom - rect.top;
 
         width = rect.right - rect.left;
         height = rect.bottom - rect.top;
 


@@ -593,6 +432,7 @@ bool wxFrame::ShowFullScreen(bool show, long style)
 
         m_fsIsShowing = FALSE;
 
 
         m_fsIsShowing = FALSE;
 

+#if wxUSE_TOOLBAR

         wxToolBar *theToolBar = GetToolBar();
 
         // restore the toolbar, menubar, and statusbar
         wxToolBar *theToolBar = GetToolBar();
 
         // restore the toolbar, menubar, and statusbar


@@ -601,8 +441,10 @@ bool wxFrame::ShowFullScreen(bool show, long style)
             theToolBar->SetSize(-1, m_fsToolBarHeight);
             theToolBar->Show(TRUE);
         }
             theToolBar->SetSize(-1, m_fsToolBarHeight);
             theToolBar->Show(TRUE);
         }

+#endif // wxUSE_TOOLBAR

 
 

-        if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR)) // && (m_fsStatusBarFields > 0))
+#if wxUSE_STATUSBAR
+        if ( m_fsStyle & wxFULLSCREEN_NOSTATUSBAR )

         {
             //CreateStatusBar(m_fsStatusBarFields);
             if (GetStatusBar())
         {
             //CreateStatusBar(m_fsStatusBarFields);
             if (GetStatusBar())


@@ -611,9 +453,12 @@ bool wxFrame::ShowFullScreen(bool show, long style)
                 PositionStatusBar();
             }
         }
                 PositionStatusBar();
             }
         }

+#endif // wxUSE_STATUSBAR

 
 

+#ifndef __WXMICROWIN__

         if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
             SetMenu((HWND)GetHWND(), (HMENU)m_hMenu);
         if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
             SetMenu((HWND)GetHWND(), (HMENU)m_hMenu);

+#endif

 
         Maximize(m_fsIsMaximized);
         SetWindowLong((HWND)GetHWND(),GWL_STYLE, m_fsOldWindowStyle);
 
         Maximize(m_fsIsMaximized);
         SetWindowLong((HWND)GetHWND(),GWL_STYLE, m_fsOldWindowStyle);


@@ -629,12 +474,10 @@ bool wxFrame::ShowFullScreen(bool show, long style)
  *
  */
 
  *
  */
 

-bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow *wx_win, const wxChar *title,
+bool wxFrameMSW::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow *wx_win, const wxChar *title,

                    int x, int y, int width, int height, long style)
 
 {
                    int x, int y, int width, int height, long style)
 
 {

-  m_defaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON);
-

   // If child windows aren't properly drawn initially, WS_CLIPCHILDREN
   // could be the culprit. But without it, you can get a lot of flicker.
 
   // If child windows aren't properly drawn initially, WS_CLIPCHILDREN
   // could be the culprit. But without it, you can get a lot of flicker.
 


@@ -668,7 +511,7 @@ bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow
   if (style & wxCLIP_CHILDREN)
     msflags |= WS_CLIPCHILDREN;
 
   if (style & wxCLIP_CHILDREN)
     msflags |= WS_CLIPCHILDREN;
 

-  // Keep this in wxFrame because it saves recoding this function
+  // Keep this in wxFrameMSW because it saves recoding this function

   // in wxTinyFrame
 #if wxUSE_ITSY_BITSY && !defined(__WIN32__)
   if (style & wxTINY_CAPTION_VERT)
   // in wxTinyFrame
 #if wxUSE_ITSY_BITSY && !defined(__WIN32__)
   if (style & wxTINY_CAPTION_VERT)


@@ -720,12 +563,12 @@ bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow
 
 // Default activation behaviour - set the focus for the first child
 // subwindow found.
 
 // Default activation behaviour - set the focus for the first child
 // subwindow found.

-void wxFrame::OnActivate(wxActivateEvent& event)
+void wxFrameMSW::OnActivate(wxActivateEvent& event)

 {
     if ( event.GetActive() )
     {
         // restore focus to the child which was last focused
 {
     if ( event.GetActive() )
     {
         // restore focus to the child which was last focused

-        wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd);
+        wxLogTrace(_T("focus"), _T("wxFrameMSW %08x activated."), m_hWnd);

 
         wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
                                             : NULL;
 
         wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
                                             : NULL;


@@ -759,7 +602,7 @@ void wxFrame::OnActivate(wxActivateEvent& event)
         }
 
         wxLogTrace(_T("focus"),
         }
 
         wxLogTrace(_T("focus"),

-                   _T("wxFrame %08x deactivated, last focused: %08x."),
+                   _T("wxFrameMSW %08x deactivated, last focused: %08x."),

                    m_hWnd,
                    m_winLastFocused ? GetHwndOf(m_winLastFocused)
                                     : NULL);
                    m_hWnd,
                    m_winLastFocused ? GetHwndOf(m_winLastFocused)
                                     : NULL);


@@ -774,7 +617,7 @@ void wxFrame::OnActivate(wxActivateEvent& event)
 
 #if wxUSE_TOOLBAR
 
 
 #if wxUSE_TOOLBAR
 

-wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
+wxToolBar* wxFrameMSW::CreateToolBar(long style, wxWindowID id, const wxString& name)

 {
     if ( wxFrameBase::CreateToolBar(style, id, name) )
     {
 {
     if ( wxFrameBase::CreateToolBar(style, id, name) )
     {


@@ -784,7 +627,7 @@ wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& nam
     return m_frameToolBar;
 }
 
     return m_frameToolBar;
 }
 

-void wxFrame::PositionToolBar()
+void wxFrameMSW::PositionToolBar()

 {
     RECT rect;
     ::GetClientRect(GetHwnd(), &rect);
 {
     RECT rect;
     ::GetClientRect(GetHwnd(), &rect);


@@ -825,7 +668,7 @@ void wxFrame::PositionToolBar()
 // propagate our state change to all child frames: this allows us to emulate X
 // Windows behaviour where child frames float independently of the parent one
 // on the desktop, but are iconized/restored with it
 // propagate our state change to all child frames: this allows us to emulate X
 // Windows behaviour where child frames float independently of the parent one
 // on the desktop, but are iconized/restored with it

-void wxFrame::IconizeChildFrames(bool bIconize)
+void wxFrameMSW::IconizeChildFrames(bool bIconize)

 {
     for ( wxWindowList::Node *node = GetChildren().GetFirst();
           node;
 {
     for ( wxWindowList::Node *node = GetChildren().GetFirst();
           node;


@@ -846,13 +689,23 @@ void wxFrame::IconizeChildFrames(bool bIconize)
         // the child MDI frames are a special case and should not be touched by
         // the parent frame - instead, they are managed by the user
         wxFrame *frame = wxDynamicCast(win, wxFrame);
         // the child MDI frames are a special case and should not be touched by
         // the parent frame - instead, they are managed by the user
         wxFrame *frame = wxDynamicCast(win, wxFrame);

-        if ( frame && !frame->IsMDIChild() )
+        if ( frame
+#if wxUSE_MDI_ARCHITECTURE
+                && !wxDynamicCast(frame, wxMDIChildFrame)
+#endif // wxUSE_MDI_ARCHITECTURE
+           )

         {
             frame->Iconize(bIconize);
         }
     }
 }
 
         {
             frame->Iconize(bIconize);
         }
     }
 }
 

+WXHICON wxFrameMSW::GetDefaultIcon() const
+{
+    return (WXHICON)(wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON
+                                      : wxDEFAULT_FRAME_ICON);
+}
+

 // ===========================================================================
 // message processing
 // ===========================================================================
 // ===========================================================================
 // message processing
 // ===========================================================================


@@ -861,11 +714,12 @@ void wxFrame::IconizeChildFrames(bool bIconize)
 // preprocessing
 // ---------------------------------------------------------------------------
 
 // preprocessing
 // ---------------------------------------------------------------------------
 

-bool wxFrame::MSWTranslateMessage(WXMSG* pMsg)
+bool wxFrameMSW::MSWTranslateMessage(WXMSG* pMsg)

 {
     if ( wxWindow::MSWTranslateMessage(pMsg) )
         return TRUE;
 
 {
     if ( wxWindow::MSWTranslateMessage(pMsg) )
         return TRUE;
 

+#if wxUSE_MENUS && wxUSE_ACCEL && !defined(__WXUNIVERSAL__)

     // try the menu bar accels
     wxMenuBar *menuBar = GetMenuBar();
     if ( !menuBar )
     // try the menu bar accels
     wxMenuBar *menuBar = GetMenuBar();
     if ( !menuBar )


@@ -873,21 +727,25 @@ bool wxFrame::MSWTranslateMessage(WXMSG* pMsg)
 
     const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
     return acceleratorTable.Translate(this, pMsg);
 
     const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
     return acceleratorTable.Translate(this, pMsg);

+#else
+    return FALSE;
+#endif // wxUSE_MENUS && wxUSE_ACCEL

 }
 
 // ---------------------------------------------------------------------------
 // our private (non virtual) message handlers
 // ---------------------------------------------------------------------------
 
 }
 
 // ---------------------------------------------------------------------------
 // our private (non virtual) message handlers
 // ---------------------------------------------------------------------------
 

-bool wxFrame::HandlePaint()
+bool wxFrameMSW::HandlePaint()

 {
     RECT rect;
     if ( GetUpdateRect(GetHwnd(), &rect, FALSE) )
     {
 {
     RECT rect;
     if ( GetUpdateRect(GetHwnd(), &rect, FALSE) )
     {

+#ifndef __WXMICROWIN__

         if ( m_iconized )
         {
             HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)
         if ( m_iconized )
         {
             HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)

-                                      : (HICON)m_defaultIcon;
+                                      : (HICON)GetDefaultIcon();

 
             // Hold a pointer to the dc so long as the OnPaint() message
             // is being processed
 
             // Hold a pointer to the dc so long as the OnPaint() message
             // is being processed


@@ -917,6 +775,7 @@ bool wxFrame::HandlePaint()
             return TRUE;
         }
         else
             return TRUE;
         }
         else

+ #endif

         {
             return wxWindow::HandlePaint();
         }
         {
             return wxWindow::HandlePaint();
         }


@@ -928,9 +787,10 @@ bool wxFrame::HandlePaint()
     }
 }
 
     }
 }
 

-bool wxFrame::HandleSize(int x, int y, WXUINT id)
+bool wxFrameMSW::HandleSize(int x, int y, WXUINT id)

 {
     bool processed = FALSE;
 {
     bool processed = FALSE;

+#ifndef __WXMICROWIN__

 
     switch ( id )
     {
 
     switch ( id )
     {


@@ -944,6 +804,8 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id)
             // restore all child frames too
             IconizeChildFrames(FALSE);
 
             // restore all child frames too
             IconizeChildFrames(FALSE);
 

+            (void)SendIconizeEvent(FALSE);
+

             // fall through
 
         case SIZEFULLSCREEN:
             // fall through
 
         case SIZEFULLSCREEN:


@@ -954,14 +816,22 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id)
             // iconize all child frames too
             IconizeChildFrames(TRUE);
 
             // iconize all child frames too
             IconizeChildFrames(TRUE);
 

+            (void)SendIconizeEvent();
+

             m_iconized = TRUE;
             break;
     }
             m_iconized = TRUE;
             break;
     }

+#endif

 
     if ( !m_iconized )
     {
 
     if ( !m_iconized )
     {

+#if wxUSE_STATUSBAR

         PositionStatusBar();
         PositionStatusBar();

+#endif // wxUSE_STATUSBAR
+
+#if wxUSE_TOOLBAR

         PositionToolBar();
         PositionToolBar();

+#endif // wxUSE_TOOLBAR

 
         wxSizeEvent event(wxSize(x, y), m_windowId);
         event.SetEventObject( this );
 
         wxSizeEvent event(wxSize(x, y), m_windowId);
         event.SetEventObject( this );


@@ -971,7 +841,7 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id)
     return processed;
 }
 
     return processed;
 }
 

-bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
+bool wxFrameMSW::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)

 {
     if ( control )
     {
 {
     if ( control )
     {


@@ -984,6 +854,7 @@ bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
     // handle here commands from menus and accelerators
     if ( cmd == 0 || cmd == 1 )
     {
     // handle here commands from menus and accelerators
     if ( cmd == 0 || cmd == 1 )
     {

+#if wxUSE_MENUS_NATIVE

         if ( wxCurrentPopupMenu )
         {
             wxMenu *popupMenu = wxCurrentPopupMenu;
         if ( wxCurrentPopupMenu )
         {
             wxMenu *popupMenu = wxCurrentPopupMenu;


@@ -991,6 +862,7 @@ bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
 
             return popupMenu->MSWCommand(cmd, id);
         }
 
             return popupMenu->MSWCommand(cmd, id);
         }

+#endif // wxUSE_MENUS_NATIVE

 
         if ( ProcessCommand(id) )
         {
 
         if ( ProcessCommand(id) )
         {


@@ -1001,7 +873,7 @@ bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
     return FALSE;
 }
 
     return FALSE;
 }
 

-bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
+bool wxFrameMSW::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)

 {
     int item;
     if ( flags == 0xFFFF && hMenu == 0 )
 {
     int item;
     if ( flags == 0xFFFF && hMenu == 0 )


@@ -1009,12 +881,15 @@ bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
         // menu was removed from screen
         item = -1;
     }
         // menu was removed from screen
         item = -1;
     }

+#ifndef __WXMICROWIN__

     else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) )
     {
         item = nItem;
     }
     else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) )
     {
         item = nItem;
     }

+#endif

     else
     {
     else
     {

+#if wxUSE_STATUSBAR

         // don't give hints for separators (doesn't make sense) nor for the
         // 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
         // don't give hints for separators (doesn't make sense) nor for the
         // 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


@@ -1024,6 +899,7 @@ bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
         {
             statbar->SetStatusText(wxEmptyString);
         }
         {
             statbar->SetStatusText(wxEmptyString);
         }

+#endif // wxUSE_STATUSBAR

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -1035,10 +911,10 @@ bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------

-// the window proc for wxFrame
+// the window proc for wxFrameMSW

 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 

-long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+long wxFrameMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)

 {
     long rc = 0;
     bool processed = FALSE;
 {
     long rc = 0;
     bool processed = FALSE;


@@ -1062,6 +938,7 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             }
             break;
 
             }
             break;
 

+#ifndef __WXMICROWIN__

         case WM_MENUSELECT:
             {
                 WXWORD item, flags;
         case WM_MENUSELECT:
             {
                 WXWORD item, flags;


@@ -1071,19 +948,22 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
                 processed = HandleMenuSelect(item, flags, hmenu);
             }
             break;
                 processed = HandleMenuSelect(item, flags, hmenu);
             }
             break;

+#endif

 
         case WM_PAINT:
             processed = HandlePaint();
             break;
 
 
         case WM_PAINT:
             processed = HandlePaint();
             break;
 

+#ifndef __WXMICROWIN__

         case WM_QUERYDRAGICON:
             {
                 HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)
         case WM_QUERYDRAGICON:
             {
                 HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)

-                                          : (HICON)(m_defaultIcon);
+                                          : (HICON)GetDefaultIcon();

                 rc = (long)hIcon;
                 processed = rc != 0;
             }
             break;
                 rc = (long)hIcon;
                 processed = rc != 0;
             }
             break;

+#endif

 
         case WM_SIZE:
             processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam);
 
         case WM_SIZE:
             processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam);