Compilaton fixes.

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index effd343a88674f207384790913bc6a4f8a5cb651..f17d23dddb1b9738a201e50e15465a24df9268c2 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -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"


@@ -72,7 +76,6 @@
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)

-    EVT_ACTIVATE(wxFrame::OnActivate)

     EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
 END_EVENT_TABLE()
 
     EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
 END_EVENT_TABLE()
 


@@ -108,11 +111,8 @@ void wxFrame::Init()
     m_fsStatusBarFields = 0;
     m_fsStatusBarHeight = 0;
     m_fsToolBarHeight = 0;
     m_fsStatusBarFields = 0;
     m_fsStatusBarHeight = 0;
     m_fsToolBarHeight = 0;

-//  m_fsMenu = 0;

 
     m_wasMinimized = FALSE;
 
     m_wasMinimized = FALSE;

-
-    m_winLastFocused = (wxWindow *)NULL;

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


@@ -136,7 +136,6 @@ bool wxFrame::Create(wxWindow *parent,
 wxFrame::~wxFrame()
 {
     m_isBeingDeleted = TRUE;
 wxFrame::~wxFrame()
 {
     m_isBeingDeleted = TRUE;

-

     DeleteAllBars();
 }
 
     DeleteAllBars();
 }
 


@@ -195,12 +194,7 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
 
 void wxFrame::Raise()
 {
 
 void wxFrame::Raise()
 {

-#ifdef __WIN16__
-    // no SetForegroundWindow() in Win16
-    wxFrameBase::Raise();
-#else // Win32

     ::SetForegroundWindow(GetHwnd());
     ::SetForegroundWindow(GetHwnd());

-#endif // Win16/32

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


@@ -270,6 +264,7 @@ void wxFrame::AttachMenuBar(wxMenuBar *menubar)
     }
     else // set new non NULL menu bar
     {
     }
     else // set new non NULL menu bar
     {

+#ifndef __WXWINCE__

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


@@ -285,14 +280,26 @@ void wxFrame::AttachMenuBar(wxMenuBar *menubar)
                 return;
             }
         }
                 return;
             }
         }

-
+#endif

         InternalSetMenuBar();
     }
 }
 
 void wxFrame::InternalSetMenuBar()
 {
         InternalSetMenuBar();
     }
 }
 
 void wxFrame::InternalSetMenuBar()
 {

-#ifndef __WXMICROWIN__
+#ifdef __WXMICROWIN__
+    // 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) )
     {
         wxLogLastError(wxT("SetMenu"));
     if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) )
     {
         wxLogLastError(wxT("SetMenu"));


@@ -324,12 +331,15 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 // Pass TRUE to show full screen, FALSE to restore.
 bool wxFrame::ShowFullScreen(bool show, long style)
 {
 // Pass TRUE to show full screen, FALSE to restore.
 bool wxFrame::ShowFullScreen(bool show, long style)
 {

-    if ( IsFullScreen() == show ) 
+    if ( IsFullScreen() == show )

         return FALSE;
 
     if (show)
     {
 #if wxUSE_TOOLBAR
         return FALSE;
 
     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);


@@ -341,9 +351,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


@@ -368,6 +380,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


@@ -376,6 +391,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


@@ -390,63 +406,14 @@ 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
     }

-    
-    return wxFrameBase::ShowFullScreen(show, style);
-}
-
-// Default activation behaviour - set the focus for the first child
-// subwindow found.
-void wxFrame::OnActivate(wxActivateEvent& event)
-{
-    if ( event.GetActive() )
-    {
-        // restore focus to the child which was last focused
-        wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd);
-
-        wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
-                                            : NULL;
-        if ( !parent )
-        {
-            parent = this;
-        }
-
-        wxSetFocusToChild(parent, &m_winLastFocused);
-    }
-    else // deactivating
-    {
-        // remember the last focused child if it is our child
-        m_winLastFocused = FindFocus();
-
-        // so we NULL it out if it's a child from some other frame
-        wxWindow *win = m_winLastFocused;
-        while ( win )
-        {
-            if ( win->IsTopLevel() )
-            {
-                if ( win != this )
-                {
-                    m_winLastFocused = NULL;
-                }
-
-                break;
-            }

 
 

-            win = win->GetParent();
-        }
-
-        wxLogTrace(_T("focus"),
-                   _T("wxFrame %08x deactivated, last focused: %08x."),
-                   m_hWnd,
-                   m_winLastFocused ? GetHwndOf(m_winLastFocused)
-                                    : NULL);
-
-        event.Skip();
-    }
+    return wxFrameBase::ShowFullScreen(show, style);

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


@@ -457,6 +424,11 @@ void wxFrame::OnActivate(wxActivateEvent& event)
 
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
 
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {

+#ifdef __WXWINCE__
+    // We may already have a toolbar from calling SetMenuBar.
+    if (GetToolBar())
+        return GetToolBar();
+#endif

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


@@ -470,6 +442,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;


@@ -500,6 +478,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__

     }
 }
 
     }
 }
 


@@ -514,7 +493,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() )
     {


@@ -560,8 +539,8 @@ void wxFrame::IconizeChildFrames(bool bIconize)
 
 WXHICON wxFrame::GetDefaultIcon() const
 {
 
 WXHICON wxFrame::GetDefaultIcon() const
 {

-    return (WXHICON)(wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON
-                                      : wxDEFAULT_FRAME_ICON);
+    // we don't have any standard icons (any more)
+    return (WXHICON)0;

 }
 
 // ===========================================================================
 }
 
 // ===========================================================================


@@ -599,7 +578,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();


@@ -649,7 +628,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 )
     {


@@ -692,9 +671,7 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id)
         PositionToolBar();
 #endif // wxUSE_TOOLBAR
 
         PositionToolBar();
 #endif // wxUSE_TOOLBAR
 

-        wxSizeEvent event(wxSize(x, y), m_windowId);
-        event.SetEventObject( this );
-        processed = GetEventHandler()->ProcessEvent(event);
+        processed = wxWindow::HandleSize(x, y, id);

     }
 
     return processed;
     }
 
     return processed;


@@ -748,17 +725,11 @@ bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
 #endif
     else
     {
 #endif
     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
         // for the previous item which doesn't apply any more
         // 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
         // for the previous item which doesn't apply any more

-        wxStatusBar *statbar = GetStatusBar();
-        if ( statbar )
-        {
-            statbar->SetStatusText(wxEmptyString);
-        }
-#endif // wxUSE_STATUSBAR
+        DoGiveHelp(wxEmptyString, FALSE);

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -815,7 +786,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;


@@ -826,15 +801,9 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             }
             break;
 
             }
             break;
 

-#ifndef __WIN16__
-        case WM_ENTERMENULOOP:
-            processed = HandleMenuLoop(wxEVT_MENU_OPEN, wParam);
-            break;
-

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

-#endif // __WIN16__

 
         case WM_QUERYDRAGICON:
             {
 
         case WM_QUERYDRAGICON:
             {


@@ -849,8 +818,30 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
     }
 
     if ( !processed )
     }
 
     if ( !processed )

-        rc = wxWindow::MSWWindowProc(message, wParam, lParam);
+        rc = wxFrameBase::MSWWindowProc(message, wParam, lParam);

 
     return rc;
 }
 
 
     return rc;
 }
 

+// handle WM_INITMENUPOPUP message
+bool wxFrame::HandleInitMenuPopup(WXHMENU hMenu)
+{
+    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);
+}