compilation fix for recent commit

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

diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h
index ed2be613806a2d2626be6d43f13b653d6718a846..6f85949b9792a75a96e2fcf701afae7674ef3976 100644 (file)
--- a/include/wx/os2/frame.h
+++ b/include/wx/os2/frame.h
@@ -17,12 +17,12 @@
 //
 #include "wx/os2/wxOs2.h"
 
 //
 #include "wx/os2/wxOs2.h"
 

-class WXDLLEXPORT wxFrameOS2 : public wxFrameBase
+class WXDLLEXPORT wxFrame : public wxFrameBase

 {
 public:
     // construction
 {
 public:
     // construction

-    wxFrameOS2() { Init(); }
-    wxFrameOS2( wxWindow*       pParent
+    wxFrame() { Init(); }
+    wxFrame( wxWindow*       pParent

                ,wxWindowID      vId
                ,const wxString& rsTitle
                ,const wxPoint&  rPos = wxDefaultPosition
                ,wxWindowID      vId
                ,const wxString& rsTitle
                ,const wxPoint&  rPos = wxDefaultPosition


@@ -45,7 +45,7 @@ public:
                 ,const wxString& rsName = wxFrameNameStr
                );
 
                 ,const wxString& rsName = wxFrameNameStr
                );
 

-    virtual ~wxFrameOS2();
+    virtual ~wxFrame();

 
     // implement base class pure virtuals
     virtual void Maximize(bool bMaximize = TRUE);
 
     // implement base class pure virtuals
     virtual void Maximize(bool bMaximize = TRUE);


@@ -53,7 +53,9 @@ public:
     virtual void Iconize(bool bIconize = TRUE);
     virtual bool IsIconized(void) const;
     virtual void Restore(void);
     virtual void Iconize(bool bIconize = TRUE);
     virtual bool IsIconized(void) const;
     virtual void Restore(void);

+#if wxUSE_MENUS_NATIVE

     virtual void SetMenuBar(wxMenuBar* pMenubar);
     virtual void SetMenuBar(wxMenuBar* pMenubar);

+#endif

     virtual void SetIcon(const wxIcon& rIcon);
     virtual bool ShowFullScreen( bool bShow
                                 ,long lStyle = wxFULLSCREEN_ALL
     virtual void SetIcon(const wxIcon& rIcon);
     virtual bool ShowFullScreen( bool bShow
                                 ,long lStyle = wxFULLSCREEN_ALL


@@ -64,6 +66,7 @@ public:
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 

+    void         AlterChildPos(void);

     // override some more virtuals
     virtual bool Show(bool bShow = TRUE);
 
     // override some more virtuals
     virtual bool Show(bool bShow = TRUE);
 


@@ -175,10 +178,9 @@ protected:
                                  ,int nWeight
                                 );
 
                                  ,int nWeight
                                 );
 

+#if wxUSE_MENUS_NATIVE

     // helper
     void         DetachMenuBar(void);
     // helper
     void         DetachMenuBar(void);

-
-#if wxUSE_MENUS_NATIVE

     // perform MSW-specific action when menubar is changed
     virtual void AttachMenuBar(wxMenuBar* pMenubar);
     // a plug in for MDI frame classes which need to do something special when
     // perform MSW-specific action when menubar is changed
     virtual void AttachMenuBar(wxMenuBar* pMenubar);
     // a plug in for MDI frame classes which need to do something special when


@@ -213,6 +215,7 @@ protected:
     int                             m_nFsToolBarHeight;
     bool                            m_bFsIsMaximized;
     bool                            m_bFsIsShowing;
     int                             m_nFsToolBarHeight;
     bool                            m_bFsIsMaximized;
     bool                            m_bFsIsShowing;

+    bool                            m_bWasMinimized;

     bool                            m_bIsShown;
     wxWindow*                       m_pWinLastFocused;
 
     bool                            m_bIsShown;
     wxWindow*                       m_pWinLastFocused;
 


@@ -245,6 +248,7 @@ private:
     SWP                             m_vSwpToolBar;
 
     DECLARE_EVENT_TABLE()
     SWP                             m_vSwpToolBar;
 
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxFrame)

 };
 
 #endif
 };
 
 #endif