X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e372bbe071de49935a1a7a910a1b268231de69e..c3c62822fdda9d340179dec663a806e905882cc9:/include/wx/os2/window.h?ds=sidebyside diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h index d9dcc7da4c..9070497a44 100644 --- a/include/wx/os2/window.h +++ b/include/wx/os2/window.h @@ -34,20 +34,7 @@ // forward declarations // --------------------------------------------------------------------------- -class WXDLLEXPORT wxButton; - -// --------------------------------------------------------------------------- -// constants -// --------------------------------------------------------------------------- - -#if WXWIN_COMPATIBILITY_2_4 -// they're unused by wxWidgets... -enum -{ - wxKEY_SHIFT = 1, - wxKEY_CTRL = 2 -}; -#endif +class WXDLLIMPEXP_FWD_CORE wxButton; // --------------------------------------------------------------------------- // wxWindow declaration for OS/2 PM @@ -95,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); @@ -178,7 +165,7 @@ public: virtual WXWidget GetHandle(void) const { return GetHWND(); } bool GetUseCtl3D(void) const { return m_bUseCtl3D; } bool GetTransparentBackground(void) const { return m_bBackgroundTransparent; } - void SetTransparent(bool bT = true) { m_bBackgroundTransparent = bT; } + void SetTransparentBackground(bool bT = true) { m_bBackgroundTransparent = bT; } // event handlers // -------------- @@ -541,7 +528,6 @@ private: ,WXWPARAM wParam = 0 ) const; - wxWindowList* m_pChildrenDisabled; HWND m_hWndScrollBarHorz; HWND m_hWndScrollBarVert; SWP m_vWinSwp;