fix compilation without WXDEBUG (includes patch 561458)

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

diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h
index cd9ebaf89adbca141e845d3d9638e0394d6fc57d..88cac74d0fa8c712f37764bc2e629ac5b9f9cded 100644 (file)
--- a/include/wx/os2/frame.h
+++ b/include/wx/os2/frame.h
@@ -15,14 +15,14 @@
 //
 // Get the default resource ID's for frames
 //
 //
 // Get the default resource ID's for frames
 //

-#include "wx/os2/wxOs2.h"
+#include "wx/os2/wxrsc.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,27 +45,21 @@ public:
                 ,const wxString& rsName = wxFrameNameStr
                );
 
                 ,const wxString& rsName = wxFrameNameStr
                );
 

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

 
     // implement base class pure virtuals
 
     // implement base class pure virtuals

-    virtual void Maximize(bool bMaximize = TRUE);
-    virtual bool IsMaximized(void) const;
-    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);

-    virtual void SetIcon(const wxIcon& rIcon);
+#endif

     virtual bool ShowFullScreen( bool bShow
                                 ,long lStyle = wxFULLSCREEN_ALL
                                );
     virtual bool ShowFullScreen( bool bShow
                                 ,long lStyle = wxFULLSCREEN_ALL
                                );

-    virtual bool IsFullScreen(void) const { return m_bFsIsShowing; };

 
 
     // implementation only from now on
     // -------------------------------
 
 
 
     // implementation only from now on
     // -------------------------------
 

-    // override some more virtuals
-    virtual bool Show(bool bShow = TRUE);
+    virtual void Raise(void);

 
     // event handlers
     void OnActivate(wxActivateEvent& rEvent);
 
     // event handlers
     void OnActivate(wxActivateEvent& rEvent);


@@ -122,18 +116,6 @@ public:
                           ,WXHMENU hMenu
                          );
 
                           ,WXHMENU hMenu
                          );
 

-    bool OS2Create( int           nId
-                   ,wxWindow*     pParent
-                   ,const wxChar* zWclass
-                   ,wxWindow*     pWxWin
-                   ,const wxChar* zTitle
-                   ,int           nX
-                   ,int           nY
-                   ,int           nWidth
-                   ,int           nHeight
-                   ,long          nStyle
-                  );
-

     // tooltip management
 #if wxUSE_TOOLTIPS
     WXHWND GetToolTipCtrl(void) const { return m_hWndToolTip; }
     // tooltip management
 #if wxUSE_TOOLTIPS
     WXHWND GetToolTipCtrl(void) const { return m_hWndToolTip; }


@@ -149,7 +131,6 @@ public:
     void      SetClient(WXHWND    c_Hwnd);
     void      SetClient(wxWindow* c_Window);
     wxWindow *GetClient();
     void      SetClient(WXHWND    c_Hwnd);
     void      SetClient(wxWindow* c_Window);
     wxWindow *GetClient();

-    HWND      GetFrame(void) const { return m_hFrame; }

 
  friend MRESULT EXPENTRY wxFrameWndProc(HWND  hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);
  friend MRESULT EXPENTRY wxFrameMainWndProc(HWND  hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);
 
  friend MRESULT EXPENTRY wxFrameWndProc(HWND  hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);
  friend MRESULT EXPENTRY wxFrameMainWndProc(HWND  hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);


@@ -158,27 +139,19 @@ protected:
     // common part of all ctors
     void         Init(void);
 
     // common part of all ctors
     void         Init(void);
 

-    // common part of Iconize(), Maximize() and Restore()
-    void         DoShowWindow(int nShowCmd);
-
+    virtual WXHICON GetDefaultIcon(void) const;

     // override base class virtuals
     virtual void DoGetClientSize( int* pWidth
                                  ,int* pHeight
                                 ) const;
     // override base class virtuals
     virtual void DoGetClientSize( int* pWidth
                                  ,int* pHeight
                                 ) const;

-    virtual void DoGetSize( int* pWidth
-                           ,int* pHeight
-                          ) const;
-    virtual void DoGetPosition( int* pX
-                               ,int* pY
-                              ) const;

     virtual void DoSetClientSize( int nWidth
                                  ,int nWeight
                                 );
     virtual void DoSetClientSize( int nWidth
                                  ,int nWeight
                                 );

+    inline virtual bool IsMDIChild(void) const { return FALSE; }

 
 

+#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 +186,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;
 


@@ -226,7 +200,6 @@ private:
     // that we don't have child objects for (m_hWnd in wxWindow is the
     // handle of the Frame's client window!
     //
     // that we don't have child objects for (m_hWnd in wxWindow is the
     // handle of the Frame's client window!
     //

-    WXHWND                          m_hFrame;

     WXHWND                          m_hTitleBar;
     WXHWND                          m_hHScroll;
     WXHWND                          m_hVScroll;
     WXHWND                          m_hTitleBar;
     WXHWND                          m_hHScroll;
     WXHWND                          m_hVScroll;


@@ -235,8 +208,6 @@ private:
     // Swp structures for various client data
     // DW: Better off in attached RefData?
     //
     // Swp structures for various client data
     // DW: Better off in attached RefData?
     //

-    SWP                             m_vSwp;
-    SWP                             m_vSwpClient;

     SWP                             m_vSwpTitleBar;
     SWP                             m_vSwpMenuBar;
     SWP                             m_vSwpHScroll;
     SWP                             m_vSwpTitleBar;
     SWP                             m_vSwpMenuBar;
     SWP                             m_vSwpHScroll;


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

-    DECLARE_DYNAMIC_CLASS(wxFrameOS2)
+    DECLARE_DYNAMIC_CLASS(wxFrame)

 };
 
 #endif
 };
 
 #endif