argh, really, really fix Darwin build

[wxWidgets.git] / include / wx / msw / frame.h

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 21b6badf8670933d842f55378a8202adf8d05bdd..5a3fb736245da39801a0f436552074f4f8c9b261 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -12,22 +12,18 @@
 #ifndef _WX_FRAME_H_
 #define _WX_FRAME_H_
 
 #ifndef _WX_FRAME_H_
 #define _WX_FRAME_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "frame.h"
-#endif
-
-class WXDLLEXPORT wxFrame : public wxFrameBase
+class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase

 {
 public:
     // construction
     wxFrame() { Init(); }
     wxFrame(wxWindow *parent,
 {
 public:
     // construction
     wxFrame() { Init(); }
     wxFrame(wxWindow *parent,

-               wxWindowID id,
-               const wxString& title,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = wxDEFAULT_FRAME_STYLE,
-               const wxString& name = wxFrameNameStr)
+            wxWindowID id,
+            const wxString& title,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            long style = wxDEFAULT_FRAME_STYLE,
+            const wxString& name = wxFrameNameStr)

     {
         Init();
 
     {
         Init();
 


@@ -57,10 +53,8 @@ public:
     // Toolbar
 #if wxUSE_TOOLBAR
     virtual wxToolBar* CreateToolBar(long style = -1,
     // Toolbar
 #if wxUSE_TOOLBAR
     virtual wxToolBar* CreateToolBar(long style = -1,

-                                     wxWindowID id = -1,
+                                     wxWindowID id = wxID_ANY,

                                      const wxString& name = wxToolBarNameStr);
                                      const wxString& name = wxToolBarNameStr);

-
-    virtual void PositionToolBar();

 #endif // wxUSE_TOOLBAR
 
     // Status bar
 #endif // wxUSE_TOOLBAR
 
     // Status bar


@@ -70,20 +64,20 @@ public:
                                            wxWindowID id = 0,
                                            const wxString& name = wxStatusLineNameStr);
 
                                            wxWindowID id = 0,
                                            const wxString& name = wxStatusLineNameStr);
 

-    virtual void PositionStatusBar();
-

     // Hint to tell framework which status bar to use: the default is to use
     // native one for the platforms which support it (Win32), the generic one
     // otherwise
 
     // TODO: should this go into a wxFrameworkSettings class perhaps?
     static void UseNativeStatusBar(bool useNative)
     // Hint to tell framework which status bar to use: the default is to use
     // native one for the platforms which support it (Win32), the generic one
     // otherwise
 
     // TODO: should this go into a wxFrameworkSettings class perhaps?
     static void UseNativeStatusBar(bool useNative)

-        { m_useNativeStatusBar = useNative; };
+        { m_useNativeStatusBar = useNative; }

     static bool UsesNativeStatusBar()
     static bool UsesNativeStatusBar()

-        { return m_useNativeStatusBar; };
+        { return m_useNativeStatusBar; }

 #endif // wxUSE_STATUSBAR
 
 #endif // wxUSE_STATUSBAR
 

+#if wxUSE_MENUS

     WXHMENU GetWinMenu() const { return m_hMenu; }
     WXHMENU GetWinMenu() const { return m_hMenu; }

+#endif // wxUSE_MENUS

 
     // event handlers
     bool HandlePaint();
 
     // event handlers
     bool HandlePaint();


@@ -102,6 +96,19 @@ public:
     // current size - this has an effect of refreshing the window layout
     virtual void SendSizeEvent();
 
     // current size - this has an effect of refreshing the window layout
     virtual void SendSizeEvent();
 

+    virtual wxPoint GetClientAreaOrigin() const;
+
+    // override base class version to add menu bar accel processing
+    virtual bool MSWTranslateMessage(WXMSG *msg)
+    {
+        return MSWDoTranslateMessage(this, msg);
+    }
+
+    // window proc for the frames
+    virtual WXLRESULT MSWWindowProc(WXUINT message,
+                                    WXWPARAM wParam,
+                                    WXLPARAM lParam);
+

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();


@@ -122,28 +129,32 @@ protected:
     // propagate our state change to all child frames
     void IconizeChildFrames(bool bIconize);
 
     // propagate our state change to all child frames
     void IconizeChildFrames(bool bIconize);
 

-    // we add menu bar accel processing
-    bool MSWTranslateMessage(WXMSG* pMsg);
+    // the real implementation of MSWTranslateMessage(), also used by
+    // wxMDIChildFrame
+    bool MSWDoTranslateMessage(wxFrame *frame, WXMSG *msg);

 
 

-    // window proc for the frames
-    long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-
-    // handle WM_INITMENUPOPUP message
+    // handle WM_INITMENUPOPUP message to generate wxEVT_MENU_OPEN

     bool HandleInitMenuPopup(WXHMENU hMenu);
 
     bool HandleInitMenuPopup(WXHMENU hMenu);
 

-    virtual bool IsMDIChild() const { return FALSE; }
+    virtual bool IsMDIChild() const { return false; }

 
 

-    // get default (wxWindows) icon for the frame
+    // get default (wxWidgets) icon for the frame

     virtual WXHICON GetDefaultIcon() const;
 
     virtual WXHICON GetDefaultIcon() const;
 

+#if wxUSE_TOOLBAR
+    virtual void PositionToolBar();
+#endif // wxUSE_TOOLBAR
+

 #if wxUSE_STATUSBAR
 #if wxUSE_STATUSBAR

+    virtual void PositionStatusBar();
+

     static bool           m_useNativeStatusBar;
 #endif // wxUSE_STATUSBAR
 
     static bool           m_useNativeStatusBar;
 #endif // wxUSE_STATUSBAR
 

-    // Data to save/restore when calling ShowFullScreen
-    int                   m_fsStatusBarFields; // 0 for no status bar
-    int                   m_fsStatusBarHeight;
-    int                   m_fsToolBarHeight;
+#if wxUSE_MENUS
+    // frame menu, NULL if none
+    WXHMENU m_hMenu;
+#endif // wxUSE_MENUS

 
 private:
 #if wxUSE_TOOLTIPS
 
 private:
 #if wxUSE_TOOLTIPS