X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/39b61aa3eb950489f880fbe2024d3b5bc82a11f5..0685aa9eb65aae0c930ef2a001002ac217cf5ce1:/include/wx/os2/window.h diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h index 2620abf79d..9765a809fa 100644 --- a/include/wx/os2/window.h +++ b/include/wx/os2/window.h @@ -34,7 +34,7 @@ // forward declarations // --------------------------------------------------------------------------- -class WXDLLEXPORT wxButton; +class WXDLLIMPEXP_FWD_CORE wxButton; // --------------------------------------------------------------------------- // wxWindow declaration for OS/2 PM @@ -82,7 +82,7 @@ public: virtual void Raise(void); virtual void Lower(void); virtual bool Show(bool bShow = true); - virtual bool Enable(bool bEnable = true); + virtual void DoEnable(bool bEnable); virtual void SetFocus(void); virtual void SetFocusFromKbd(void); virtual bool Reparent(wxWindow* pNewParent); @@ -92,9 +92,7 @@ public: virtual void Refresh( bool bEraseBackground = true ,const wxRect* pRect = (const wxRect *)NULL ); - virtual void Freeze(void); virtual void Update(void); - virtual void Thaw(void); virtual void SetWindowStyleFlag(long lStyle); virtual bool SetCursor(const wxCursor& rCursor); virtual bool SetFont(const wxFont& rFont); @@ -416,6 +414,9 @@ public: PSWP GetSwp(void) {return &m_vWinSwp;} protected: + virtual void DoFreeze(void); + virtual void DoThaw(void); + // PM can't create some MSW styles natively but can perform these after // creation by sending messages typedef enum extra_flags { kFrameToolWindow = 0x0001 @@ -528,7 +529,6 @@ private: ,WXWPARAM wParam = 0 ) const; - wxWindowList* m_pChildrenDisabled; HWND m_hWndScrollBarHorz; HWND m_hWndScrollBarVert; SWP m_vWinSwp;