call SetHorizontalExtent() from SetString(); also simplified/cleaned up the former...

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 1ec081f3f4dd1b0f4eb0f46d3624d07973dea59b..800cd97d862c93fdfd0097c589608b6fdf389e47 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/frame.cpp
+// Name:        src/msw/frame.cpp

 // Purpose:     wxFrame
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxFrame
 // Author:      Julian Smart
 // Modified by:


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


@@ -28,8 +24,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/frame.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/frame.h"

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


@@ -38,25 +35,24 @@
     #include "wx/dcclient.h"
     #include "wx/mdi.h"
     #include "wx/panel.h"
     #include "wx/dcclient.h"
     #include "wx/mdi.h"
     #include "wx/panel.h"

+    #include "wx/log.h"
+    #include "wx/toolbar.h"
+    #include "wx/statusbr.h"
+    #include "wx/menuitem.h"

 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"
 
 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"
 

-#ifdef __WXWINCE__
-#include <commctrl.h>
-#endif
-
-#if wxUSE_STATUSBAR
-    #include "wx/statusbr.h"
-    #include "wx/generic/statusbr.h"
-#endif // wxUSE_STATUSBAR
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"

 
 

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

 
 

-#include "wx/menuitem.h"
-#include "wx/log.h"
+#include "wx/generic/statusbr.h"

 
 #ifdef __WXUNIVERSAL__
     #include "wx/univ/theme.h"
 
 #ifdef __WXUNIVERSAL__
     #include "wx/univ/theme.h"


@@ -113,10 +109,14 @@ wxBEGIN_FLAGS( wxFrameStyle )
     // frame styles
     wxFLAGS_MEMBER(wxSTAY_ON_TOP)
     wxFLAGS_MEMBER(wxCAPTION)
     // frame styles
     wxFLAGS_MEMBER(wxSTAY_ON_TOP)
     wxFLAGS_MEMBER(wxCAPTION)

+#if WXWIN_COMPATIBILITY_2_6

     wxFLAGS_MEMBER(wxTHICK_FRAME)
     wxFLAGS_MEMBER(wxTHICK_FRAME)

+#endif // WXWIN_COMPATIBILITY_2_6

     wxFLAGS_MEMBER(wxSYSTEM_MENU)
     wxFLAGS_MEMBER(wxRESIZE_BORDER)
     wxFLAGS_MEMBER(wxSYSTEM_MENU)
     wxFLAGS_MEMBER(wxRESIZE_BORDER)

+#if WXWIN_COMPATIBILITY_2_6

     wxFLAGS_MEMBER(wxRESIZE_BOX)
     wxFLAGS_MEMBER(wxRESIZE_BOX)

+#endif // WXWIN_COMPATIBILITY_2_6

     wxFLAGS_MEMBER(wxCLOSE_BOX)
     wxFLAGS_MEMBER(wxMAXIMIZE_BOX)
     wxFLAGS_MEMBER(wxMINIMIZE_BOX)
     wxFLAGS_MEMBER(wxCLOSE_BOX)
     wxFLAGS_MEMBER(wxMAXIMIZE_BOX)
     wxFLAGS_MEMBER(wxMINIMIZE_BOX)


@@ -197,14 +197,14 @@ bool wxFrame::Create(wxWindow *parent,
     SetLeftMenu(wxID_EXIT, _("Done"));
 #endif
 
     SetLeftMenu(wxID_EXIT, _("Done"));
 #endif
 

-#if defined(__POCKETPC__)
+#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);
     // 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
+#endif // wxUSE_ACCEL && __POCKETPC__

 
     return true;
 }
 
     return true;
 }


@@ -357,7 +357,7 @@ void wxFrame::AttachMenuBar(wxMenuBar *menubar)
 #elif defined(WINCE_WITHOUT_COMMANDBAR)
     if (!GetToolBar())
     {
 #elif defined(WINCE_WITHOUT_COMMANDBAR)
     if (!GetToolBar())
     {

-        wxToolBar* toolBar = new wxToolBar(this, wxID_ANY,
+        wxToolMenuBar* toolBar = new wxToolMenuBar(this, wxID_ANY,

                          wxDefaultPosition, wxDefaultSize,
                          wxBORDER_NONE | wxTB_HORIZONTAL,
                          wxToolBarNameStr, menubar);
                          wxDefaultPosition, wxDefaultSize,
                          wxBORDER_NONE | wxTB_HORIZONTAL,
                          wxToolBarNameStr, menubar);


@@ -502,8 +502,27 @@ bool wxFrame::ShowFullScreen(bool show, long style)
         }
 #endif // wxUSE_TOOLBAR
 
         }
 #endif // wxUSE_TOOLBAR
 

-        if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && m_hMenu)
-            ::SetMenu(GetHwnd(), (HMENU)m_hMenu);
+        if (m_fsStyle & wxFULLSCREEN_NOMENUBAR)
+        {
+            WXHMENU menu = m_hMenu;
+
+#if wxUSE_MDI_ARCHITECTURE
+            wxMDIParentFrame *frame = wxDynamicCast(this, wxMDIParentFrame);
+            if (frame)
+            {
+                wxMDIChildFrame *child = frame->GetActiveChild();
+                if (child)
+                {
+                    menu = child->GetWinMenu();
+                }
+            }
+#endif // wxUSE_MDI_ARCHITECTURE
+
+            if (menu)
+            {
+                ::SetMenu(GetHwnd(), (HMENU)menu);
+            }
+        }

 
 #if wxUSE_STATUSBAR
         wxStatusBar *theStatusBar = GetStatusBar();
 
 #if wxUSE_STATUSBAR
         wxStatusBar *theStatusBar = GetStatusBar();


@@ -662,17 +681,15 @@ void wxFrame::IconizeChildFrames(bool bIconize)
         // them appear in the taskbar because they are, by virtue of this
         // style, not managed by the taskbar - instead leave Windows take care
         // of them
         // them appear in the taskbar because they are, by virtue of this
         // style, not managed by the taskbar - instead leave Windows take care
         // of them

-#ifdef __WIN95__

         if ( win->GetWindowStyle() & wxFRAME_TOOL_WINDOW )
             continue;
         if ( win->GetWindowStyle() & wxFRAME_TOOL_WINDOW )
             continue;

-#endif // Win95

 
         // the child MDI frames are a special case and should not be touched by
         // the parent frame - instead, they are managed by the user
         wxFrame *frame = wxDynamicCast(win, wxFrame);
         if ( frame
 #if wxUSE_MDI_ARCHITECTURE
 
         // the child MDI frames are a special case and should not be touched by
         // the parent frame - instead, they are managed by the user
         wxFrame *frame = wxDynamicCast(win, wxFrame);
         if ( frame
 #if wxUSE_MDI_ARCHITECTURE

-                && !IsMDIChild()
+                && !frame->IsMDIChild()

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


@@ -707,7 +724,7 @@ WXHICON wxFrame::GetDefaultIcon() const
 // preprocessing
 // ---------------------------------------------------------------------------
 
 // preprocessing
 // ---------------------------------------------------------------------------
 

-bool wxFrame::MSWTranslateMessage(WXMSG* pMsg)
+bool wxFrame::MSWDoTranslateMessage(wxFrame *frame, WXMSG *pMsg)

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


@@ -715,14 +732,14 @@ bool wxFrame::MSWTranslateMessage(WXMSG* pMsg)
 #if wxUSE_MENUS && wxUSE_ACCEL && !defined(__WXUNIVERSAL__)
     // try the menu bar accels
     wxMenuBar *menuBar = GetMenuBar();
 #if wxUSE_MENUS && wxUSE_ACCEL && !defined(__WXUNIVERSAL__)
     // try the menu bar accels
     wxMenuBar *menuBar = GetMenuBar();

-    if ( !menuBar )
-        return false;
+    if ( menuBar )
+    {
+        const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
+        return acceleratorTable.Translate(frame, pMsg);
+    }
+#endif // wxUSE_MENUS && wxUSE_ACCEL

 
 

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

     return false;
     return false;

-#endif // wxUSE_MENUS && wxUSE_ACCEL

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