Added clipboard cut and paste

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index e99831a461b6aee638a9c28fde02e12eeee61d43..d15747b1ea96bfbfdbe1e46cc890928b7a1cf575 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:     wxFrameMSW
+// Purpose:     wxFrame

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


@@ -63,8 +63,6 @@
 // globals
 // ----------------------------------------------------------------------------
 
 // globals
 // ----------------------------------------------------------------------------
 

-extern wxWindowList wxModelessWindows;
-extern wxList WXDLLEXPORT wxPendingDelete;

 extern const wxChar *wxFrameClassName;
 
 #if wxUSE_MENUS_NATIVE
 extern const wxChar *wxFrameClassName;
 
 #if wxUSE_MENUS_NATIVE


@@ -75,14 +73,12 @@ extern wxMenu *wxCurrentPopupMenu;
 // event tables
 // ----------------------------------------------------------------------------
 
 // event tables
 // ----------------------------------------------------------------------------
 

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

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

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

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


@@ -94,9 +90,9 @@ END_EVENT_TABLE()
 
 #if wxUSE_STATUSBAR
     #if wxUSE_NATIVE_STATUSBAR
 
 #if wxUSE_STATUSBAR
     #if wxUSE_NATIVE_STATUSBAR

-        bool wxFrameMSW::m_useNativeStatusBar = TRUE;
+        bool wxFrame::m_useNativeStatusBar = TRUE;

     #else
     #else

-        bool wxFrameMSW::m_useNativeStatusBar = FALSE;
+        bool wxFrame::m_useNativeStatusBar = FALSE;

     #endif
 #endif // wxUSE_NATIVE_STATUSBAR
 
     #endif
 #endif // wxUSE_NATIVE_STATUSBAR
 


@@ -104,32 +100,24 @@ END_EVENT_TABLE()
 // creation/destruction
 // ----------------------------------------------------------------------------
 
 // creation/destruction
 // ----------------------------------------------------------------------------
 

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

 {
 {

-    m_iconized =
-    m_maximizeOnShow = FALSE;
-

 #if wxUSE_TOOLTIPS
     m_hwndToolTip = 0;
 #endif
 
     // Data to save/restore when calling ShowFullScreen
 #if wxUSE_TOOLTIPS
     m_hwndToolTip = 0;
 #endif
 
     // Data to save/restore when calling ShowFullScreen

-    m_fsStyle = 0;
-    m_fsOldWindowStyle = 0;

     m_fsStatusBarFields = 0;
     m_fsStatusBarHeight = 0;
     m_fsToolBarHeight = 0;
 //  m_fsMenu = 0;
     m_fsStatusBarFields = 0;
     m_fsStatusBarHeight = 0;
     m_fsToolBarHeight = 0;
 //  m_fsMenu = 0;

-    m_fsIsMaximized = FALSE;
-    m_fsIsShowing = FALSE;

 
 

-    m_winLastFocused = (wxWindow *)NULL;
+    m_wasMinimized = FALSE;

 
 

-    // unlike (almost?) all other windows, frames are created hidden
-    m_isShown = FALSE;
+    m_winLastFocused = (wxWindow *)NULL;

 }
 
 }
 

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

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


@@ -137,78 +125,25 @@ bool wxFrameMSW::Create(wxWindow *parent,
                      long style,
                      const wxString& name)
 {
                      long style,
                      const wxString& name)
 {

-  SetName(name);
-  m_windowStyle = style;
-#if wxUSE_MENUS
-  m_frameMenuBar = NULL;
-#endif // wxUSE_MENUS
-#if wxUSE_TOOLBAR
-  m_frameToolBar = NULL;
-#endif // wxUSE_TOOLBAR
-#if wxUSE_STATUSBAR
-  m_frameStatusBar = NULL;
-#endif // wxUSE_STATUSBAR
-
-  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;
-
-  wxTopLevelWindows.Append(this);
+    if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+        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;

 }
 
 }
 

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

 {
 {

-  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();
+    m_isBeingDeleted = TRUE;

 
 

-  if (wxTheApp && (wxTopLevelWindows.Number() == 0))
-  {
-    wxTheApp->SetTopWindow(NULL);
-
-    if (wxTheApp->GetExitOnFrameDelete())
-    {
-       PostQuitMessage(0);
-    }
-  }
-
-  wxModelessWindows.DeleteObject(this);
-
-  // 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 wxFrameMSW::DoGetClientSize(int *x, int *y) const
+void wxFrame::DoGetClientSize(int *x, int *y) const

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


@@ -232,203 +167,41 @@ void wxFrameMSW::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 wxFrameMSW::DoSetClientSize(int width, int height)
+void wxFrame::DoSetClientSize(int width, int height)

 {
 {

-    HWND hWnd = GetHwnd();
-
-    RECT rectClient;
-    ::GetClientRect(hWnd, &rectClient);
-
-    RECT rectTotal;
-    ::GetWindowRect(hWnd, &rectTotal);
-
-    // 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
-    width += rectTotal.right - rectTotal.left - rectClient.right;
-    height += rectTotal.bottom - rectTotal.top - rectClient.bottom;
-
+    // leave enough space for the status bar if we have (and show) it

 #if wxUSE_STATUSBAR
     wxStatusBar *statbar = GetStatusBar();
     if ( statbar && statbar->IsShown() )
     {
 #if wxUSE_STATUSBAR
     wxStatusBar *statbar = GetStatusBar();
     if ( statbar && statbar->IsShown() )
     {

-        // leave enough space for the status bar

         height += statbar->GetSize().y;
     }
 #endif // wxUSE_STATUSBAR
 
         height += statbar->GetSize().y;
     }
 #endif // wxUSE_STATUSBAR
 

-    // note that this takes the toolbar into account
-    wxPoint pt = GetClientAreaOrigin();
-    width += pt.x;
-    height += pt.y;
-
-    if ( !::MoveWindow(hWnd, rectTotal.left, rectTotal.top,
-                       width, height, TRUE /* redraw */) )
-    {
-        wxLogLastError(_T("MoveWindow"));
-    }
-
-    wxSizeEvent event(wxSize(width, height), m_windowId);
-    event.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(event);
-}
-
-void wxFrameMSW::DoGetSize(int *width, int *height) const
-{
-    RECT rect;
-    ::GetWindowRect(GetHwnd(), &rect);
-
-    *width = rect.right - rect.left;
-    *height = rect.bottom - rect.top;
-}
-
-void wxFrameMSW::DoGetPosition(int *x, int *y) const
-{
-    RECT rect;
-    ::GetWindowRect(GetHwnd(), &rect);
-
-    *x = rect.left;
-    *y = rect.top;
+    wxTopLevelWindow::DoSetClientSize(width, height);

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

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

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

-void wxFrameMSW::DoShowWindow(int nShowCmd)
-{
-    ::ShowWindow(GetHwnd(), nShowCmd);
-
-    m_iconized = nShowCmd == SW_MINIMIZE;
-}
-
-bool wxFrameMSW::Show(bool show)
-{
-    // don't use wxWindow version as we want to call DoShowWindow()
-    if ( !wxWindowBase::Show(show) )
-        return FALSE;
-
-    int nShowCmd;
-    if ( show )
-    {
-        if ( m_maximizeOnShow )
-        {
-            // show and maximize
-            nShowCmd = SW_MAXIMIZE;
-
-            m_maximizeOnShow = FALSE;
-        }
-        else // just show
-        {
-            nShowCmd = SW_SHOW;
-        }
-    }
-    else // hide
-    {
-        nShowCmd = SW_HIDE;
-    }
-
-    DoShowWindow(nShowCmd);
-
-    if ( show )
-    {
-        ::BringWindowToTop(GetHwnd());
-
-        wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_windowId);
-        event.SetEventObject( this );
-        GetEventHandler()->ProcessEvent(event);
-    }
-    else // hide
-    {
-        // Try to highlight the correct window (the parent)
-        if ( GetParent() )
-        {
-            HWND hWndParent = GetHwndOf(GetParent());
-            if (hWndParent)
-                ::BringWindowToTop(hWndParent);
-        }
-    }
-
-    return TRUE;
-}
-
-void wxFrameMSW::Iconize(bool iconize)
-{
-    DoShowWindow(iconize ? SW_MINIMIZE : SW_RESTORE);
-}
-
-void wxFrameMSW::Maximize(bool maximize)
-{
-    if ( IsShown() )
-    {
-        // just maximize it directly
-        DoShowWindow(maximize ? SW_MAXIMIZE : SW_RESTORE);
-    }
-    else // hidden
-    {
-        // we can't maximize the hidden frame because it shows it as well, so
-        // just remember that we should do it later in this case
-        m_maximizeOnShow = TRUE;
-    }
-}
-
-void wxFrameMSW::Restore()
-{
-    DoShowWindow(SW_RESTORE);
-}
-
-bool wxFrameMSW::IsIconized() const
-{
-#ifdef __WXMICROWIN__
-  // TODO
-  return FALSE;
-#else
-  ((wxFrameMSW *)this)->m_iconized = (::IsIconic(GetHwnd()) != 0);
-  return m_iconized;
-#endif
-}
-
-// Is it maximized?
-bool wxFrameMSW::IsMaximized() const
-{
-#ifdef __WXMICROWIN__
-  // TODO
-  return FALSE;
-#else
-    return (::IsZoomed(GetHwnd()) != 0);
-#endif
-}
-
-void wxFrameMSW::SetIcon(const wxIcon& icon)
+void wxFrame::Raise()

 {
 {

-    wxFrameBase::SetIcon(icon);
-
-#if defined(__WIN95__) && !defined(__WXMICROWIN__)
-    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 wxFrameMSW::SendSizeEvent()
+void wxFrame::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));


@@ -436,7 +209,7 @@ void wxFrameMSW::SendSizeEvent()
 }
 
 #if wxUSE_STATUSBAR
 }
 
 #if wxUSE_STATUSBAR

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

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


@@ -454,23 +227,12 @@ wxStatusBar *wxFrameMSW::OnCreateStatusBar(int number,
         statusBar = new wxStatusBar(this, id, style, name);
     }
 
         statusBar = new wxStatusBar(this, id, style, name);
     }
 

-    // Set the height according to the font and the border size
-    wxClientDC dc(statusBar);
-    dc.SetFont(statusBar->GetFont());
-
-    wxCoord y;
-    dc.GetTextExtent(_T("X"), NULL, &y );
-
-    int height = (int)( (11*y)/10 + 2*statusBar->GetBorderY());
-
-    statusBar->SetSize(-1, -1, -1, height);
-

     statusBar->SetFieldsCount(number);
 
     return statusBar;
 }
 
     statusBar->SetFieldsCount(number);
 
     return statusBar;
 }
 

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

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


@@ -486,24 +248,12 @@ void wxFrameMSW::PositionStatusBar()
 }
 #endif // wxUSE_STATUSBAR
 
 }
 #endif // wxUSE_STATUSBAR
 

-void wxFrameMSW::DetachMenuBar()
-{
-#if wxUSE_MENUS
-    if ( m_frameMenuBar )
-    {
-        m_frameMenuBar->Detach();
-        m_frameMenuBar = NULL;
-    }
-#endif // wxUSE_MENUS
-}
+#if wxUSE_MENUS_NATIVE

 
 

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

 {
 {

-#if wxUSE_MENUS
-    // detach the old menu bar in any case
-    DetachMenuBar();
+    wxFrameBase::AttachMenuBar(menubar);

 
 

-#if wxUSE_MENUS_NATIVE

     if ( !menubar )
     {
         // actually remove the menu from the frame
     if ( !menubar )
     {
         // actually remove the menu from the frame


@@ -517,32 +267,22 @@ void wxFrameMSW::SetMenuBar(wxMenuBar *menubar)
         {
             m_hMenu = menubar->GetHMenu();
         }
         {
             m_hMenu = menubar->GetHMenu();
         }

-        else
+        else // no HMENU yet

         {
         {

-            if (menubar->IsAttached())
-                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();
     }

-#endif // wxUSE_MENUS_NATIVE
-
-    if ( menubar )
-    {
-        m_frameMenuBar = menubar;
-        menubar->Attach((wxFrame *)this);
-    }
-#endif // wxUSE_MENUS

 }
 
 }
 

-#if wxUSE_MENUS_NATIVE
-
-void wxFrameMSW::InternalSetMenuBar()
+void wxFrame::InternalSetMenuBar()

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


@@ -555,7 +295,7 @@ void wxFrameMSW::InternalSetMenuBar()
 #endif // wxUSE_MENUS_NATIVE
 
 // Responds to colour changes, and passes event on to children.
 #endif // wxUSE_MENUS_NATIVE
 
 // Responds to colour changes, and passes event on to children.

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

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


@@ -574,16 +314,13 @@ void wxFrameMSW::OnSysColourChanged(wxSysColourChangedEvent& event)
 }
 
 // Pass TRUE to show full screen, FALSE to restore.
 }
 
 // Pass TRUE to show full screen, FALSE to restore.

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

 {
 {

+    if ( IsFullScreen() == show ) 
+        return FALSE;
+

     if (show)
     {
     if (show)
     {

-        if (IsFullScreen())
-            return FALSE;
-
-        m_fsIsShowing = TRUE;
-        m_fsStyle = style;
-

 #if wxUSE_TOOLBAR
         wxToolBar *theToolBar = GetToolBar();
         if (theToolBar)
 #if wxUSE_TOOLBAR
         wxToolBar *theToolBar = GetToolBar();
         if (theToolBar)


@@ -619,55 +356,9 @@ bool wxFrameMSW::ShowFullScreen(bool show, long style)
         else
             m_fsStatusBarFields = 0;
 #endif // wxUSE_STATUSBAR
         else
             m_fsStatusBarFields = 0;
 #endif // wxUSE_STATUSBAR

-
-        // zap the frame borders
-
-        // save the 'normal' window style
-        m_fsOldWindowStyle = GetWindowLong((HWND)GetHWND(), GWL_STYLE);
-
-        // save the old position, width & height, maximize state
-        m_fsOldSize = GetRect();
-        m_fsIsMaximized = IsMaximized();
-
-        // decide which window style flags to turn off
-        LONG newStyle = m_fsOldWindowStyle;
-        LONG offFlags = 0;
-
-        if (style & wxFULLSCREEN_NOBORDER)
-            offFlags |= WS_BORDER;
-        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);
-
-        // resize to the size of the desktop
-        int width, height;
-
-        RECT rect;
-        ::GetWindowRect(GetDesktopWindow(), &rect);
-        width = rect.right - rect.left;
-        height = rect.bottom - rect.top;
-
-        SetSize(width, height);
-
-        // now flush the window style cache and actually go full-screen
-        SetWindowPos((HWND)GetHWND(), HWND_TOP, 0, 0, width, height, SWP_FRAMECHANGED);
-
-        wxSizeEvent event(wxSize(width, height), GetId());
-        GetEventHandler()->ProcessEvent(event);
-
-        return TRUE;

     }
     else
     {
     }
     else
     {

-        if (!IsFullScreen())
-            return FALSE;
-
-        m_fsIsShowing = FALSE;
-

 #if wxUSE_TOOLBAR
         wxToolBar *theToolBar = GetToolBar();
 
 #if wxUSE_TOOLBAR
         wxToolBar *theToolBar = GetToolBar();
 


@@ -695,118 +386,19 @@ bool wxFrameMSW::ShowFullScreen(bool show, long style)
         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

-
-        Maximize(m_fsIsMaximized);
-        SetWindowLong((HWND)GetHWND(),GWL_STYLE, m_fsOldWindowStyle);
-        SetWindowPos((HWND)GetHWND(),HWND_TOP,m_fsOldSize.x, m_fsOldSize.y,
-            m_fsOldSize.width, m_fsOldSize.height, SWP_FRAMECHANGED);
-
-        return TRUE;

     }
     }

-}
-
-/*
- * Frame window
- *
- */
-
-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)
-
-{
-  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.
-
-  DWORD msflags = 0;
-  if ( style & wxCAPTION )
-  {
-    if ( style & wxFRAME_TOOL_WINDOW )
-        msflags |= WS_POPUPWINDOW;
-    else
-        msflags |= WS_OVERLAPPED;
-  }
-  else
-  {
-    msflags |= WS_POPUP;
-  }
-
-  if (style & wxMINIMIZE_BOX)
-    msflags |= WS_MINIMIZEBOX;
-  if (style & wxMAXIMIZE_BOX)
-    msflags |= WS_MAXIMIZEBOX;
-  if (style & wxTHICK_FRAME)
-    msflags |= WS_THICKFRAME;
-  if (style & wxSYSTEM_MENU)
-    msflags |= WS_SYSMENU;
-  if ( style & wxMINIMIZE )
-    msflags |= WS_MINIMIZE;
-  if (style & wxMAXIMIZE)
-    msflags |= WS_MAXIMIZE;
-  if (style & wxCAPTION)
-    msflags |= WS_CAPTION;
-  if (style & wxCLIP_CHILDREN)
-    msflags |= WS_CLIPCHILDREN;
-
-  // Keep this in wxFrameMSW because it saves recoding this function
-  // in wxTinyFrame
-#if wxUSE_ITSY_BITSY && !defined(__WIN32__)
-  if (style & wxTINY_CAPTION_VERT)
-    msflags |= IBS_VERTCAPTION;
-  if (style & wxTINY_CAPTION_HORIZ)
-    msflags |= IBS_HORZCAPTION;
-#else
-  if (style & wxTINY_CAPTION_VERT)
-    msflags |= WS_CAPTION;
-  if (style & wxTINY_CAPTION_HORIZ)
-    msflags |= WS_CAPTION;
-#endif
-  if ((style & wxTHICK_FRAME) == 0)
-    msflags |= WS_BORDER;
-
-  WXDWORD extendedStyle = MakeExtendedStyle(style);
-
-  // make all frames appear in the win9x shell taskbar unless
-  // wxFRAME_TOOL_WINDOW or wxFRAME_NO_TASKBAR is given - without giving them
-  // WS_EX_APPWINDOW style, the child (i.e. owned) frames wouldn't appear in it
-#if !defined(__WIN16__) && !defined(__SC__)
-  if ( (style & wxFRAME_TOOL_WINDOW) ||
-       (style & wxFRAME_NO_TASKBAR) )
-      extendedStyle |= WS_EX_TOOLWINDOW;
-  else if ( !(style & wxFRAME_NO_TASKBAR) )
-      extendedStyle |= WS_EX_APPWINDOW;
-#endif
-
-  if (style & wxSTAY_ON_TOP)
-    extendedStyle |= WS_EX_TOPMOST;
-
-#ifndef __WIN16__
-  if (m_exStyle & wxFRAME_EX_CONTEXTHELP)
-    extendedStyle |= WS_EX_CONTEXTHELP;
-#endif
-
-  m_iconized = FALSE;
-  if ( !wxWindow::MSWCreate(id, parent, wclass, wx_win, title, x, y, width, height,
-         msflags, NULL, extendedStyle) )
-         return FALSE;
-
-  // Seems to be necessary if we use WS_POPUP
-  // style instead of WS_OVERLAPPED
-  if (width > -1 && height > -1)
-    ::PostMessage(GetHwnd(), WM_SIZE, SIZE_RESTORED, MAKELPARAM(width, height));
-
-  return TRUE;
+    
+    return wxFrameBase::ShowFullScreen(show, style);

 }
 
 // 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 wxFrameMSW::OnActivate(wxActivateEvent& event)
+void wxFrame::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("wxFrameMSW %08x activated."), m_hWnd);
+        wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd);

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


@@ -840,7 +432,7 @@ void wxFrameMSW::OnActivate(wxActivateEvent& event)
         }
 
         wxLogTrace(_T("focus"),
         }
 
         wxLogTrace(_T("focus"),

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

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


@@ -855,7 +447,7 @@ void wxFrameMSW::OnActivate(wxActivateEvent& event)
 
 #if wxUSE_TOOLBAR
 
 
 #if wxUSE_TOOLBAR
 

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

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


@@ -865,7 +457,7 @@ wxToolBar* wxFrameMSW::CreateToolBar(long style, wxWindowID id, const wxString&
     return m_frameToolBar;
 }
 
     return m_frameToolBar;
 }
 

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

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


@@ -906,7 +498,7 @@ void wxFrameMSW::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 wxFrameMSW::IconizeChildFrames(bool bIconize)
+void wxFrame::IconizeChildFrames(bool bIconize)

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


@@ -926,18 +518,38 @@ void wxFrameMSW::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
 
         // the child MDI frames are a special case and should not be touched by
         // the parent frame - instead, they are managed by the user

-        wxFrameMSW *frame = wxDynamicCast(win, wxFrameMSW);
+        wxFrame *frame = wxDynamicCast(win, wxFrame);

         if ( frame
 #if wxUSE_MDI_ARCHITECTURE
                 && !wxDynamicCast(frame, wxMDIChildFrame)
 #endif // wxUSE_MDI_ARCHITECTURE
            )
         {
         if ( frame
 #if wxUSE_MDI_ARCHITECTURE
                 && !wxDynamicCast(frame, wxMDIChildFrame)
 #endif // wxUSE_MDI_ARCHITECTURE
            )
         {

-            frame->Iconize(bIconize);
+            // we don't want to restore the child frames which had been
+            // iconized even before we were iconized, so save the child frame
+            // status when iconizing the parent frame and check it when
+            // 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();
+            }
+
+            // this test works for both iconizing and restoring
+            if ( !frame->m_wasMinimized )
+                frame->Iconize(bIconize);

         }
     }
 }
 
         }
     }
 }
 

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

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


@@ -946,7 +558,7 @@ void wxFrameMSW::IconizeChildFrames(bool bIconize)
 // preprocessing
 // ---------------------------------------------------------------------------
 
 // preprocessing
 // ---------------------------------------------------------------------------
 

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

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


@@ -968,7 +580,7 @@ bool wxFrameMSW::MSWTranslateMessage(WXMSG* pMsg)
 // our private (non virtual) message handlers
 // ---------------------------------------------------------------------------
 
 // our private (non virtual) message handlers
 // ---------------------------------------------------------------------------
 

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

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


@@ -977,7 +589,7 @@ bool wxFrameMSW::HandlePaint()
         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


@@ -1019,7 +631,7 @@ bool wxFrameMSW::HandlePaint()
     }
 }
 
     }
 }
 

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

 {
     bool processed = FALSE;
 #ifndef __WXMICROWIN__
 {
     bool processed = FALSE;
 #ifndef __WXMICROWIN__


@@ -1073,7 +685,7 @@ bool wxFrameMSW::HandleSize(int x, int y, WXUINT id)
     return processed;
 }
 
     return processed;
 }
 

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

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


@@ -1105,7 +717,7 @@ bool wxFrameMSW::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
     return FALSE;
 }
 
     return FALSE;
 }
 

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

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


@@ -1143,10 +755,10 @@ bool wxFrameMSW::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------

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

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

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

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


@@ -1190,7 +802,7 @@ long wxFrameMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
         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;
             }
                 rc = (long)hIcon;
                 processed = rc != 0;
             }