Added headers that didn't get installed.

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index b4a87c8cc49c69198adcede77813ba2787632a4d..f2dff269be21019194ddedd6b5b7f5964d2f933b 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -42,6 +42,10 @@
 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

+#ifdef __WXWINCE__
+#include <commctrl.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"


@@ -102,6 +106,9 @@ void wxFrame::Init()
 #if wxUSE_TOOLTIPS
     m_hwndToolTip = 0;
 #endif
 #if wxUSE_TOOLTIPS
     m_hwndToolTip = 0;
 #endif

+#ifdef __WXWINCE__
+    m_commandBar = 0;
+#endif

 
     // Data to save/restore when calling ShowFullScreen
     m_fsStatusBarFields = 0;
 
     // Data to save/restore when calling ShowFullScreen
     m_fsStatusBarFields = 0;


@@ -132,8 +139,11 @@ bool wxFrame::Create(wxWindow *parent,
 wxFrame::~wxFrame()
 {
     m_isBeingDeleted = TRUE;
 wxFrame::~wxFrame()
 {
     m_isBeingDeleted = TRUE;

-

     DeleteAllBars();
     DeleteAllBars();

+#ifdef __WXWINCE__
+    RemoveCommandBar();
+#endif
+

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


@@ -283,7 +293,23 @@ void wxFrame::AttachMenuBar(wxMenuBar *menubar)
 
 void wxFrame::InternalSetMenuBar()
 {
 
 void wxFrame::InternalSetMenuBar()
 {

-#ifndef __WXMICROWIN__
+#ifdef __WXMICROWIN__
+    // Nothing
+#elif defined(__WXWINCE__)
+    
+    CreateCommandBar() ;
+
+    if (m_commandBar)
+    {
+        if (!CommandBar_InsertMenubarEx((HWND) m_commandBar, NULL,
+            (LPTSTR) (HMENU) m_hMenu, 0))
+        {
+            wxFAIL_MSG( _T("failed to set menubar") );
+            return;
+        }
+        CommandBar_DrawMenuBar((HWND) m_commandBar, 0);
+    }
+#else

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


@@ -321,6 +347,9 @@ bool wxFrame::ShowFullScreen(bool show, long style)
     if (show)
     {
 #if wxUSE_TOOLBAR
     if (show)
     {
 #if wxUSE_TOOLBAR

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

         wxToolBar *theToolBar = GetToolBar();
         if (theToolBar)
             theToolBar->GetSize(NULL, &m_fsToolBarHeight);
         wxToolBar *theToolBar = GetToolBar();
         if (theToolBar)
             theToolBar->GetSize(NULL, &m_fsToolBarHeight);


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

+#endif // __WXWINCE__

 #endif // wxUSE_TOOLBAR
 
 #endif // wxUSE_TOOLBAR
 

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

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


@@ -359,6 +390,9 @@ bool wxFrame::ShowFullScreen(bool show, long style)
     else
     {
 #if wxUSE_TOOLBAR
     else
     {
 #if wxUSE_TOOLBAR

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

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


@@ -367,6 +401,7 @@ bool wxFrame::ShowFullScreen(bool show, long style)
             theToolBar->SetSize(-1, m_fsToolBarHeight);
             theToolBar->Show(TRUE);
         }
             theToolBar->SetSize(-1, m_fsToolBarHeight);
             theToolBar->Show(TRUE);
         }

+#endif // __WXWINCE__

 #endif // wxUSE_TOOLBAR
 
 #if wxUSE_STATUSBAR
 #endif // wxUSE_TOOLBAR
 
 #if wxUSE_STATUSBAR


@@ -381,7 +416,8 @@ bool wxFrame::ShowFullScreen(bool show, long style)
         }
 #endif // wxUSE_STATUSBAR
 
         }
 #endif // wxUSE_STATUSBAR
 

-#ifndef __WXMICROWIN__
+        // 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
         if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
             SetMenu((HWND)GetHWND(), (HMENU)m_hMenu);
 #endif


@@ -411,6 +447,12 @@ void wxFrame::PositionToolBar()
     wxToolBar *toolbar = GetToolBar();
     if ( toolbar && toolbar->IsShown() )
     {
     wxToolBar *toolbar = GetToolBar();
     if ( toolbar && toolbar->IsShown() )
     {

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

         // don't call our (or even wxTopLevelWindow) version because we want
         // the real (full) client area size, not excluding the tool/status bar
         int width, height;
         // don't call our (or even wxTopLevelWindow) version because we want
         // the real (full) client area size, not excluding the tool/status bar
         int width, height;


@@ -441,6 +483,7 @@ void wxFrame::PositionToolBar()
         // use the 'real' MSW position here, don't offset relativly to the
         // client area origin
         toolbar->SetSize(0, 0, tw, th, wxSIZE_NO_ADJUSTMENTS);
         // use the 'real' MSW position here, don't offset relativly to the
         // client area origin
         toolbar->SetSize(0, 0, tw, th, wxSIZE_NO_ADJUSTMENTS);

+#endif // __WXWINCE__

     }
 }
 
     }
 }
 


@@ -455,7 +498,7 @@ 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)
 {

-    for ( wxWindowList::Node *node = GetChildren().GetFirst();
+    for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

           node;
           node = node->GetNext() )
     {
           node;
           node = node->GetNext() )
     {


@@ -540,7 +583,7 @@ bool wxFrame::HandlePaint()
     RECT rect;
     if ( GetUpdateRect(GetHwnd(), &rect, FALSE) )
     {
     RECT rect;
     if ( GetUpdateRect(GetHwnd(), &rect, FALSE) )
     {

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

         if ( m_iconized )
         {
             const wxIcon& icon = GetIcon();
         if ( m_iconized )
         {
             const wxIcon& icon = GetIcon();


@@ -590,7 +633,7 @@ bool wxFrame::HandlePaint()
 bool wxFrame::HandleSize(int x, int y, WXUINT id)
 {
     bool processed = FALSE;
 bool wxFrame::HandleSize(int x, int y, WXUINT id)
 {
     bool processed = FALSE;

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

 
     switch ( id )
     {
 
     switch ( id )
     {


@@ -748,7 +791,11 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             processed = HandlePaint();
             break;
 
             processed = HandlePaint();
             break;
 

-#ifndef __WXMICROWIN__
+        case WM_INITMENUPOPUP:
+            processed = HandleInitMenuPopup((WXHMENU) wParam);
+            break;
+
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)

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


@@ -759,10 +806,6 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             }
             break;
 
             }
             break;
 

-        case WM_INITMENU:
-            processed = HandleInitMenu();
-            break;
-

         case WM_EXITMENULOOP:
             processed = HandleMenuLoop(wxEVT_MENU_CLOSE, wParam);
             break;
         case WM_EXITMENULOOP:
             processed = HandleMenuLoop(wxEVT_MENU_CLOSE, wParam);
             break;


@@ -785,13 +828,52 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
     return rc;
 }
 
     return rc;
 }
 

-// handle WM_INITMENU message
-bool wxFrame::HandleInitMenu()
+// handle WM_INITMENUPOPUP message
+bool wxFrame::HandleInitMenuPopup(WXHMENU hMenu)

 {
 {

-    wxMenuEvent event(wxEVT_MENU_OPEN, 0);
+    wxMenu* menu = NULL;
+    if (GetMenuBar())
+    {
+        int nCount = GetMenuBar()->GetMenuCount();
+        for (int n = 0; n < nCount; n++)
+        {
+            if (GetMenuBar()->GetMenu(n)->GetHMenu() == hMenu)
+            {
+                menu = GetMenuBar()->GetMenu(n);
+                break;
+            }
+        }
+    }
+    
+    wxMenuEvent event(wxEVT_MENU_OPEN, 0, menu);

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

+#ifdef __WXWINCE__
+WXHWND wxFrame::CreateCommandBar()
+{
+    if (m_commandBar)
+        return m_commandBar;
+
+    m_commandBar = (WXHWND) CommandBar_Create(wxGetInstance(), GetHwnd(), NewControlId());
+    if (!m_commandBar)
+    {
+        wxFAIL_MSG( _T("failed to create commandbar") );
+        return 0;
+    }
+    return m_commandBar;
+}
+
+void wxFrame::RemoveCommandBar()
+{
+    if (m_commandBar)
+    {
+        ::DestroyWindow((HWND) m_commandBar);
+        m_commandBar = NULL;
+    }
+}
+#endif
+