X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47a8a4d5cc3e8fcb2efee4787cb9d244104beea5..a721fd82b7ca8c97048453d4aaff559e8f741d69:/include/wx/os2/window.h diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h index 4e035fa4df..6f2294c6b5 100644 --- a/include/wx/os2/window.h +++ b/include/wx/os2/window.h @@ -34,13 +34,13 @@ // forward declarations // --------------------------------------------------------------------------- -class WXDLLEXPORT wxButton; +class WXDLLIMPEXP_FWD_CORE wxButton; // --------------------------------------------------------------------------- // wxWindow declaration for OS/2 PM // --------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowOS2 : public wxWindowBase +class WXDLLIMPEXP_CORE wxWindowOS2 : public wxWindowBase { public: wxWindowOS2() @@ -85,16 +85,14 @@ public: virtual void DoEnable(bool bEnable); virtual void SetFocus(void); virtual void SetFocusFromKbd(void); - virtual bool Reparent(wxWindow* pNewParent); + virtual bool Reparent(wxWindowBase* pNewParent); virtual void WarpPointer( int x ,int y ); 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); @@ -103,8 +101,8 @@ public: virtual void GetTextExtent( const wxString& rString ,int* pX ,int* pY - ,int* pDescent = (int *)NULL - ,int* pExternalLeading = (int *)NULL + ,int* pDescent = NULL + ,int* pExternalLeading = NULL ,const wxFont* pTheFont = (const wxFont *)NULL ) const; #if wxUSE_MENUS_NATIVE @@ -129,7 +127,7 @@ public: virtual int GetScrollRange(int nOrient) const; virtual void ScrollWindow( int nDx ,int nDy - ,const wxRect* pRect = (wxRect *)NULL + ,const wxRect* pRect = NULL ); inline HWND GetScrollBarHorz(void) const {return m_hWndScrollBarHorz;} @@ -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 @@ -535,12 +536,6 @@ private: DECLARE_DYNAMIC_CLASS(wxWindowOS2); DECLARE_NO_COPY_CLASS(wxWindowOS2) DECLARE_EVENT_TABLE() - - // - // Virtual function hiding supression - // - inline virtual bool Reparent(wxWindowBase* pNewParent) - { return(wxWindowBase::Reparent(pNewParent));} }; // end of wxWindow class wxWindowCreationHook @@ -555,8 +550,8 @@ public: // --------------------------------------------------------------------------- // kbd code translation -WXDLLEXPORT int wxCharCodeOS2ToWX(int nKeySym); -WXDLLEXPORT int wxCharCodeWXToOS2( int nId +WXDLLIMPEXP_CORE int wxCharCodeOS2ToWX(int nKeySym); +WXDLLIMPEXP_CORE int wxCharCodeWXToOS2( int nId ,bool* pbIsVirtual = NULL );