fix memory leak as Dimitri suggested

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

diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h
index 04aa11e48d77263c038ed83acd6ca5ede233e2a7..261d6562d8516d1ab28d1762d0979ab7af981783 100644 (file)
--- a/include/wx/os2/window.h
+++ b/include/wx/os2/window.h
@@ -227,9 +227,6 @@ public:
     void OnIdle(wxIdleEvent& rEvent);
 
 public:
-    // For hidden notebook pages, always TRUE for everything else
-    bool IsActivePage(void) const { return m_bIsActivePage; }
-    void SetActivePage(bool bActive) { m_bIsActivePage = bActive; }
 
     // For implementation purposes - sometimes decorations make the client area
     // smaller
@@ -370,10 +367,12 @@ public:
     virtual bool OS2OnDrawItem( int               nId
                                ,WXDRAWITEMSTRUCT* pItem
                               );
-    virtual bool OS2OnMeasureItem( int                  nId
+    virtual long OS2OnMeasureItem( int                  nId
                                   ,WXMEASUREITEMSTRUCT* pItem
                                  );
 
+    virtual void OnPaint(wxPaintEvent& rEvent);
+
     // the rest are not virtual
     bool HandleCreate( WXLPCREATESTRUCT vCs
                       ,bool*            pMayCreate
@@ -602,20 +601,20 @@ private:
                               ,WXWPARAM    wParam = 0
                              ) const;
 
+    wxWindowList*                   m_pChildrenDisabled;
+    HWND                            m_hWndScrollBarHorz;
+    HWND                            m_hWndScrollBarVert;
+    SWP                             m_vWinSwp;
 
     DECLARE_DYNAMIC_CLASS(wxWindowOS2);
     DECLARE_NO_COPY_CLASS(wxWindowOS2)
     DECLARE_EVENT_TABLE()
 
-private:
-    HWND                            m_hWndScrollBarHorz;
-    HWND                            m_hWndScrollBarVert;
-    SWP                             m_vWinSwp;
-    bool                            m_bIsActivePage;
-
+    //
     // Virtual function hiding supression
+    //
     inline virtual bool Reparent(wxWindowBase* pNewParent)
-    { return(wxWindowBase::Reparent(pNewParent));};
+    { return(wxWindowBase::Reparent(pNewParent));}
 }; // end of wxWindow
 
 class wxWindowCreationHook