use wxIsNullDouble instead of comparing m_ration with 0

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index b9bd4090b7de579621ec308c82fdaf09cad52c38..c1904ead5c87911cf043a6e8a58226fbef9d6ae1 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "frame.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"
 


@@ -46,6 +42,12 @@
 #include <commctrl.h>
 #endif
 
 #include <commctrl.h>
 #endif
 

+#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
+    #include <ole2.h>
+    #include <aygshell.h>
+    #include "wx/msw/winundef.h"
+#endif
+

 #if wxUSE_STATUSBAR
     #include "wx/statusbr.h"
     #include "wx/generic/statusbr.h"
 #if wxUSE_STATUSBAR
     #include "wx/statusbr.h"
     #include "wx/generic/statusbr.h"


@@ -82,66 +84,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_DELEGATE( OnMenu , wxEVT_COMMAND_MENU_SELECTED , wxCommandEvent)
+wxBEGIN_PROPERTIES_TABLE(wxFrame)
+    wxEVENT_PROPERTY( Menu , wxEVT_COMMAND_MENU_SELECTED , wxCommandEvent)

 
 

-    WX_PROPERTY( Title,wxString, SetTitle, GetTitle, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    WX_PROPERTY_FLAGS( WindowStyle , wxFrameStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-    WX_PROPERTY( MenuBar , wxMenuBar * , SetMenuBar , GetMenuBar , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-WX_END_PROPERTIES_TABLE()
+    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)


@@ -157,9 +159,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
 
 #if wxUSE_STATUSBAR
     #if wxUSE_NATIVE_STATUSBAR
 
 #if wxUSE_STATUSBAR
     #if wxUSE_NATIVE_STATUSBAR

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

     #else
     #else

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

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


@@ -169,16 +171,23 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
 
 void wxFrame::Init()
 {
 
 void wxFrame::Init()
 {

+#if wxUSE_MENUS
+    m_hMenu = NULL;
+#endif // wxUSE_MENUS
+

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

-    // Data to save/restore when calling ShowFullScreen
-    m_fsStatusBarFields = 0;
-    m_fsStatusBarHeight = 0;
-    m_fsToolBarHeight = 0;
+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
+    SHACTIVATEINFO* info = new SHACTIVATEINFO;
+    memset(info, 0, sizeof(SHACTIVATEINFO));
+    info->cbSize = sizeof(SHACTIVATEINFO);
+
+    m_activateInfo = (void*) info;
+#endif

 
 

-    m_wasMinimized = FALSE;
+    m_wasMinimized = false;

 }
 
 bool wxFrame::Create(wxWindow *parent,
 }
 
 bool wxFrame::Create(wxWindow *parent,


@@ -190,19 +199,36 @@ bool wxFrame::Create(wxWindow *parent,
                      const wxString& name)
 {
     if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
                      const wxString& name)
 {
     if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )

-        return FALSE;
+        return false;
+
+    SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));

 
 

-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
+#if defined(__SMARTPHONE__)
+    SetLeftMenu(wxID_EXIT, _("Done"));
+#endif

 
 

-    wxModelessWindows.Append(this);
+#if wxUSE_ACCEL && defined(__POCKETPC__)
+    // The guidelines state that Ctrl+Q should quit the app.
+    // Let's define an accelerator table to send wxID_EXIT.
+    wxAcceleratorEntry entries[1];
+    entries[0].Set(wxACCEL_CTRL,   'Q',         wxID_EXIT);
+    wxAcceleratorTable accel(1, entries);
+    SetAcceleratorTable(accel);
+#endif // wxUSE_ACCEL && __POCKETPC__

 
 

-    return TRUE;
+    return true;

 }
 
 wxFrame::~wxFrame()
 {
 }
 
 wxFrame::~wxFrame()
 {

-    m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = true;

     DeleteAllBars();
     DeleteAllBars();

+
+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
+    SHACTIVATEINFO* info = (SHACTIVATEINFO*) m_activateInfo;
+    delete info;
+    m_activateInfo = NULL;
+#endif

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


@@ -282,7 +308,7 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number,
                                         wxWindowID id,
                                         const wxString& name)
 {
                                         wxWindowID id,
                                         const wxString& name)
 {

-    wxStatusBar *statusBar = NULL;
+    wxStatusBar *statusBar wxDUMMY_INITIALIZE(NULL);

 
 #if wxUSE_NATIVE_STATUSBAR
     if ( !UsesNativeStatusBar() )
 
 #if wxUSE_NATIVE_STATUSBAR
     if ( !UsesNativeStatusBar() )


@@ -320,6 +346,56 @@ void wxFrame::PositionStatusBar()
 
 void wxFrame::AttachMenuBar(wxMenuBar *menubar)
 {
 
 void wxFrame::AttachMenuBar(wxMenuBar *menubar)
 {

+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
+
+    wxMenu *autoMenu = NULL;
+
+    if( menubar->GetMenuCount() == 1 )
+    {
+        autoMenu = wxTopLevelWindowMSW::ButtonMenu::DuplicateMenu(menubar->GetMenu(0));
+        SetRightMenu(wxID_ANY, menubar->GetLabelTop(0), autoMenu);
+    }
+    else
+    {
+        autoMenu = new wxMenu;
+
+        for( size_t n = 0; n < menubar->GetMenuCount(); n++ )
+        {
+            wxMenu *item = menubar->GetMenu(n);
+            wxString label = menubar->GetLabelTop(n);
+            wxMenu *new_item = wxTopLevelWindowMSW::ButtonMenu::DuplicateMenu(item);
+            autoMenu->Append(wxID_ANY, label, new_item);
+        }
+
+        SetRightMenu(wxID_ANY, _("Menu"), autoMenu);
+    }
+
+#elif defined(WINCE_WITHOUT_COMMANDBAR)
+    if (!GetToolBar())
+    {
+        wxToolMenuBar* toolBar = new wxToolMenuBar(this, wxID_ANY,
+                         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 )


@@ -330,7 +406,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__) || defined(WINCE_WITH_COMMANDBAR)

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


@@ -353,18 +429,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) )
     {


@@ -378,7 +444,7 @@ void wxFrame::InternalSetMenuBar()
 // Responds to colour changes, and passes event on to children.
 void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
 // Responds to colour changes, and passes event on to children.
 void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {

-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
+    SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));

     Refresh();
 
 #if wxUSE_STATUSBAR
     Refresh();
 
 #if wxUSE_STATUSBAR


@@ -394,90 +460,78 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
     wxWindow::OnSysColourChanged(event);
 }
 
     wxWindow::OnSysColourChanged(event);
 }
 

-// Pass TRUE to show full screen, FALSE to restore.
+// Pass true to show full screen, false to restore.

 bool wxFrame::ShowFullScreen(bool show, long style)
 {
 bool wxFrame::ShowFullScreen(bool show, long style)
 {

+    // TODO-CE: add support for CE
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)

     if ( IsFullScreen() == show )
     if ( IsFullScreen() == show )

-        return FALSE;
+        return false;

 
     if (show)
     {
 
     if (show)
     {

+        // zap the toolbar, menubar, and statusbar if needed
+        //
+        // TODO: hide commandbar for WINCE_WITH_COMMANDBAR

 #if wxUSE_TOOLBAR
 #if wxUSE_TOOLBAR

-#ifdef __WXWINCE__
-        // TODO: hide commandbar
-#else

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

-        if (theToolBar)
-            theToolBar->GetSize(NULL, &m_fsToolBarHeight);
-
-        // zap the toolbar, menubar, and statusbar

 
         if ((style & wxFULLSCREEN_NOTOOLBAR) && theToolBar)
         {
 
         if ((style & wxFULLSCREEN_NOTOOLBAR) && theToolBar)
         {

-            theToolBar->SetSize(-1,0);
-            theToolBar->Show(FALSE);
+            if ( theToolBar->IsShown() )
+            {
+                theToolBar->SetSize(wxDefaultCoord,0);
+                theToolBar->Show(false);
+            }
+            else // prevent it from being restored later
+            {
+                style &= ~wxFULLSCREEN_NOTOOLBAR;
+            }

         }
         }

-#endif // __WXWINCE__

 #endif // wxUSE_TOOLBAR
 
 #endif // wxUSE_TOOLBAR
 

-        // TODO: make it work for WinCE
-#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)

         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 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)
         {

-            //m_fsStatusBarFields = theStatusBar->GetFieldsCount();
-            //SetStatusBar((wxStatusBar*) NULL);
-            //delete theStatusBar;
-            theStatusBar->Show(FALSE);
+            if ( theStatusBar->IsShown() )
+                theStatusBar->Show(false);
+            else
+                style &= ~wxFULLSCREEN_NOSTATUSBAR;

         }
         }

-        else
-            m_fsStatusBarFields = 0;

 #endif // wxUSE_STATUSBAR
     }
 #endif // wxUSE_STATUSBAR
     }

-    else
+    else // restore to normal

     {
     {

+        // restore the toolbar, menubar, and statusbar if we had hid them

 #if wxUSE_TOOLBAR
 #if wxUSE_TOOLBAR

-#ifdef __WXWINCE__
-        // TODO: show commandbar
-#else

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

-        // restore the toolbar, menubar, and statusbar
-        if (theToolBar && (m_fsStyle & wxFULLSCREEN_NOTOOLBAR))
+        if ((m_fsStyle & wxFULLSCREEN_NOTOOLBAR) && theToolBar)

         {
         {

-            theToolBar->SetSize(-1, m_fsToolBarHeight);
-            theToolBar->Show(TRUE);
+            theToolBar->Show(true);

         }
         }

-#endif // __WXWINCE__

 #endif // wxUSE_TOOLBAR
 
 #endif // wxUSE_TOOLBAR
 

+        if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && m_hMenu)
+            ::SetMenu(GetHwnd(), (HMENU)m_hMenu);
+

 #if wxUSE_STATUSBAR
 #if wxUSE_STATUSBAR

-        if ( m_fsStyle & wxFULLSCREEN_NOSTATUSBAR )
+        wxStatusBar *theStatusBar = GetStatusBar();
+
+        if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar)

         {
         {

-            //CreateStatusBar(m_fsStatusBarFields);
-            if (GetStatusBar())
-            {
-                GetStatusBar()->Show(TRUE);
-                PositionStatusBar();
-            }
+            theStatusBar->Show(true);
+            PositionStatusBar();

         }
 #endif // wxUSE_STATUSBAR
         }
 #endif // wxUSE_STATUSBAR

-
-        // TODO: make it work for WinCE
-#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
-        if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
-            SetMenu((HWND)GetHWND(), (HMENU)m_hMenu);
-#endif

     }
     }

+#endif // !defined(__WXMICROWIN__) && !defined(__WXWINCE__)

 
     return wxFrameBase::ShowFullScreen(show, style);
 }
 
     return wxFrameBase::ShowFullScreen(show, style);
 }


@@ -490,7 +544,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(WINCE_WITHOUT_COMMANDBAR)

     // 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();


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

-#ifdef __WXWINCE__
+#if defined(WINCE_WITHOUT_COMMANDBAR)

         // 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.


@@ -527,17 +581,29 @@ void wxFrame::PositionToolBar()
         }
 #endif // wxUSE_STATUSBAR
 
         }
 #endif // wxUSE_STATUSBAR
 

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

-        
+

         // Adjust
         if (ty < 0 && (-ty == th))
             ty = 0;
         if (tx < 0 && (-tx == tw))
         // Adjust
         if (ty < 0 && (-ty == th))
             ty = 0;
         if (tx < 0 && (-tx == tw))

-            tx = 0;        
-        
+            tx = 0;
+

         int desiredW = tw;
         int desiredH = th;
 
         int desiredW = tw;
         int desiredH = th;
 


@@ -550,23 +616,23 @@ void wxFrame::PositionToolBar()
             desiredW = width;
 //            if ( toolbar->GetWindowStyleFlag() & wxTB_FLAT )
 //                desiredW -= 3;
             desiredW = width;
 //            if ( toolbar->GetWindowStyleFlag() & wxTB_FLAT )
 //                desiredW -= 3;

-        }        
+        }

 
         // use the 'real' MSW position here, don't offset relativly to the
         // client area origin
 
         // Optimise such that we don't have to always resize the toolbar
 
         // use the 'real' MSW position here, don't offset relativly to the
         // client area origin
 
         // Optimise such that we don't have to always resize the toolbar

-        // when the frame changes, otherwise we'll get a lot of flicker.        
-        bool heightChanging = TRUE;
-        bool widthChanging = TRUE;
-        
+        // when the frame changes, otherwise we'll get a lot of flicker.
+        bool heightChanging wxDUMMY_INITIALIZE(true);
+        bool widthChanging wxDUMMY_INITIALIZE(true);
+

         if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
         {
             // It's OK if the current height is greater than what can be shown.
             heightChanging = (desiredH > th) ;
             widthChanging = (desiredW != tw) ;
         if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
         {
             // It's OK if the current height is greater than what can be shown.
             heightChanging = (desiredH > th) ;
             widthChanging = (desiredW != tw) ;

-            
-            // The next time around, we may not have to set the size            
+
+            // The next time around, we may not have to set the size

             if (heightChanging)
                 desiredH = desiredH + 200;
         }
             if (heightChanging)
                 desiredH = desiredH + 200;
         }


@@ -576,14 +642,14 @@ void wxFrame::PositionToolBar()
             widthChanging = (desiredW > tw) ;
             heightChanging = (desiredH != th) ;
 
             widthChanging = (desiredW > tw) ;
             heightChanging = (desiredH != th) ;
 

-            // The next time around, we may not have to set the size            
+            // The next time around, we may not have to set the size

             if (widthChanging)
                 desiredW = desiredW + 200;
         }
             if (widthChanging)
                 desiredW = desiredW + 200;
         }

-        
+

         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__
     }
 }


@@ -599,6 +665,8 @@ void wxFrame::PositionToolBar()
 // on the desktop, but are iconized/restored with it
 void wxFrame::IconizeChildFrames(bool bIconize)
 {
 // on the desktop, but are iconized/restored with it
 void wxFrame::IconizeChildFrames(bool bIconize)
 {

+    m_iconized = bIconize;
+

     for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
           node;
           node = node->GetNext() )
     for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
           node;
           node = node->GetNext() )


@@ -620,7 +688,7 @@ void wxFrame::IconizeChildFrames(bool bIconize)
         wxFrame *frame = wxDynamicCast(win, wxFrame);
         if ( frame
 #if wxUSE_MDI_ARCHITECTURE
         wxFrame *frame = wxDynamicCast(win, wxFrame);
         if ( frame
 #if wxUSE_MDI_ARCHITECTURE

-                && !wxDynamicCast(frame, wxMDIChildFrame)
+                && !frame->IsMDIChild()

 #endif // wxUSE_MDI_ARCHITECTURE
            )
         {
 #endif // wxUSE_MDI_ARCHITECTURE
            )
         {


@@ -630,14 +698,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);
         }
     }


@@ -660,18 +726,18 @@ WXHICON wxFrame::GetDefaultIcon() const
 bool wxFrame::MSWTranslateMessage(WXMSG* pMsg)
 {
     if ( wxWindow::MSWTranslateMessage(pMsg) )
 bool wxFrame::MSWTranslateMessage(WXMSG* pMsg)
 {
     if ( wxWindow::MSWTranslateMessage(pMsg) )

-        return TRUE;
+        return true;

 
 #if wxUSE_MENUS && wxUSE_ACCEL && !defined(__WXUNIVERSAL__)
     // try the menu bar accels
     wxMenuBar *menuBar = GetMenuBar();
     if ( !menuBar )
 
 #if wxUSE_MENUS && wxUSE_ACCEL && !defined(__WXUNIVERSAL__)
     // try the menu bar accels
     wxMenuBar *menuBar = GetMenuBar();
     if ( !menuBar )

-        return FALSE;
+        return false;

 
     const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
     return acceleratorTable.Translate(this, pMsg);
 #else
 
     const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
     return acceleratorTable.Translate(this, pMsg);
 #else

-    return FALSE;
+    return false;

 #endif // wxUSE_MENUS && wxUSE_ACCEL
 }
 
 #endif // wxUSE_MENUS && wxUSE_ACCEL
 }
 


@@ -682,7 +748,7 @@ bool wxFrame::MSWTranslateMessage(WXMSG* pMsg)
 bool wxFrame::HandlePaint()
 {
     RECT rect;
 bool wxFrame::HandlePaint()
 {
     RECT rect;

-    if ( GetUpdateRect(GetHwnd(), &rect, FALSE) )
+    if ( ::GetUpdateRect(GetHwnd(), &rect, FALSE) )

     {
 #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
         if ( m_iconized )
     {
 #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
         if ( m_iconized )


@@ -716,7 +782,7 @@ bool wxFrame::HandlePaint()
 
             ::EndPaint(GetHwnd(), &ps);
 
 
             ::EndPaint(GetHwnd(), &ps);
 

-            return TRUE;
+            return true;

         }
         else
  #endif
         }
         else
  #endif


@@ -727,18 +793,17 @@ bool wxFrame::HandlePaint()
     else
     {
         // nothing to paint - processed
     else
     {
         // nothing to paint - processed

-        return TRUE;
+        return true;

     }
 }
 
     }
 }
 

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

 {
 {

-    bool processed = FALSE;

 #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
 #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)

-

     switch ( id )
     {
     switch ( id )
     {

-        case SIZENORMAL:
+        case SIZE_RESTORED:
+        case SIZE_MAXIMIZED:

             // only do it it if we were iconized before, otherwise resizing the
             // parent frame has a curious side effect of bringing it under it's
             // children
             // only do it it if we were iconized before, otherwise resizing the
             // parent frame has a curious side effect of bringing it under it's
             // children


@@ -746,26 +811,19 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id)
                 break;
 
             // restore all child frames too
                 break;
 
             // restore all child frames too

-            IconizeChildFrames(FALSE);
+            IconizeChildFrames(false);

 
 

-            (void)SendIconizeEvent(FALSE);
-
-            // fall through
-
-        case SIZEFULLSCREEN:
-            m_iconized = FALSE;
+            (void)SendIconizeEvent(false);

             break;
 
             break;
 

-        case SIZEICONIC:
+        case SIZE_MINIMIZED:

             // iconize all child frames too
             // iconize all child frames too

-            IconizeChildFrames(TRUE);
-
-            (void)SendIconizeEvent();
-
-            m_iconized = TRUE;
+            IconizeChildFrames(true);

             break;
     }
             break;
     }

-#endif
+#else
+    wxUnusedVar(id);
+#endif // !__WXWINCE__

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


@@ -777,10 +835,25 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id)
         PositionToolBar();
 #endif // wxUSE_TOOLBAR
 
         PositionToolBar();
 #endif // wxUSE_TOOLBAR
 

-        processed = wxWindow::HandleSize(x, y, id);
+#if defined(WINCE_WITH_COMMANDBAR)
+        // 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 // WINCE_WITH_COMMANDBAR

     }
 
     }
 

-    return processed;
+    // call the base class version to generate the appropriate events
+    return false;

 }
 
 bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
 }
 
 bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)


@@ -806,13 +879,21 @@ bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
         }
 #endif // wxUSE_MENUS_NATIVE
 
         }
 #endif // wxUSE_MENUS_NATIVE
 

+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
+        // handle here commands from Smartphone menu bar
+        if ( wxTopLevelWindow::HandleCommand(id, cmd, control ) )
+        {
+            return true;
+        }
+#endif // __SMARTPHONE__ && __WXWINCE__
+

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

-            return TRUE;
+            return true;

         }
     }
 
         }
     }
 

-    return FALSE;
+    return false;

 }
 
 bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
 }
 
 bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)


@@ -835,9 +916,9 @@ bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
         // 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
         // for the previous item which doesn't apply any more
         // 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
         // for the previous item which doesn't apply any more

-        DoGiveHelp(wxEmptyString, FALSE);
+        DoGiveHelp(wxEmptyString, false);

 
 

-        return FALSE;
+        return false;

     }
 
     wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item);
     }
 
     wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item);


@@ -860,13 +941,46 @@ 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;
-    bool processed = FALSE;
+    WXLRESULT rc = 0;
+    bool processed = false;

 
     switch ( message )
     {
 
     switch ( message )
     {

+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
+        case WM_ACTIVATE:
+        {
+            SHACTIVATEINFO* info = (SHACTIVATEINFO*) m_activateInfo;
+            if (info)
+                SHHandleWMActivate(GetHwnd(), wParam, lParam, info, FALSE);
+            
+            // This implicitly sends a wxEVT_ACTIVATE_APP event
+            if (wxTheApp)
+                wxTheApp->SetActive(wParam != 0, FindFocus());
+            break;
+        }
+        case WM_SETTINGCHANGE:
+        {
+            SHACTIVATEINFO* info = (SHACTIVATEINFO*) m_activateInfo;
+            if (info)
+                SHHandleWMSettingChange(GetHwnd(), wParam, lParam, info);
+            processed = true;
+            break;
+        }
+        case WM_HIBERNATE:
+        {
+            wxActivateEvent event(wxEVT_HIBERNATE, true, wxID_ANY);
+            event.SetEventObject(wxTheApp);
+
+            if (wxTheApp)
+            {
+                processed = wxTheApp->ProcessEvent(event);
+            }
+            break;
+        }
+#endif
+

         case WM_CLOSE:
             // if we can't close, tell the system that we processed the
             // message - otherwise it would close us
         case WM_CLOSE:
             // if we can't close, tell the system that we processed the
             // message - otherwise it would close us


@@ -908,7 +1022,7 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             break;
 
         case WM_EXITMENULOOP:
             break;
 
         case WM_EXITMENULOOP:

-            processed = HandleMenuLoop(wxEVT_MENU_CLOSE, wParam);
+            processed = HandleMenuLoop(wxEVT_MENU_CLOSE, (WXWORD)wParam);

             break;
 
         case WM_QUERYDRAGICON:
             break;
 
         case WM_QUERYDRAGICON:


@@ -945,9 +1059,51 @@ bool wxFrame::HandleInitMenuPopup(WXHMENU hMenu)
             }
         }
     }
             }
         }
     }

-    
+

     wxMenuEvent event(wxEVT_MENU_OPEN, 0, menu);
     event.SetEventObject(this);
 
     return GetEventHandler()->ProcessEvent(event);
 }
     wxMenuEvent event(wxEVT_MENU_OPEN, 0, menu);
     event.SetEventObject(this);
 
     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(WINCE_WITH_COMMANDBAR)
+    if (GetMenuBar() && GetMenuBar()->GetCommandBar())
+    {
+        RECT rect;
+        ::GetWindowRect((HWND) GetMenuBar()->GetCommandBar(), &rect);
+        pt.y += (rect.bottom - rect.top);
+    }
+#endif
+
+    return pt;
+}