incomplete paste error

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

diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h
index f18fc3eeaad51dc750652b8efbb76f063936ab4c..bd6193b209facda0052df92e2cdec259bbdd3141 100644 (file)
--- a/include/wx/os2/window.h
+++ b/include/wx/os2/window.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        window.h
+// Name:        wx/os2/window.h

 // Purpose:     wxWindow class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxWindow class
 // Author:      David Webster
 // Modified by:


@@ -34,26 +34,13 @@
 // forward declarations
 // ---------------------------------------------------------------------------
 
 // 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
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // wxWindow declaration for OS/2 PM
 // ---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxWindowOS2 : public wxWindowBase
+class WXDLLIMPEXP_CORE wxWindowOS2 : public wxWindowBase

 {
 public:
     wxWindowOS2()
 {
 public:
     wxWindowOS2()


@@ -90,42 +77,27 @@ public:
                );
 
     // implement base class pure virtuals
                );
 
     // implement base class pure virtuals

-    virtual void     SetTitle(const wxString& rTitle);
-    virtual wxString GetTitle(void) const;
+    virtual void     SetLabel(const wxString& label);
+    virtual wxString GetLabel(void) const;

     virtual void     Raise(void);
     virtual void     Lower(void);
     virtual bool     Show(bool bShow = true);
     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 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     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     Update(void);

-    virtual void     Thaw(void);

     virtual void     SetWindowStyleFlag(long lStyle);
     virtual bool     SetCursor(const wxCursor& rCursor);
     virtual bool     SetFont(const wxFont& rFont);
     virtual int      GetCharHeight(void) const;
     virtual int      GetCharWidth(void) const;
     virtual void     SetWindowStyleFlag(long lStyle);
     virtual bool     SetCursor(const wxCursor& rCursor);
     virtual bool     SetFont(const wxFont& rFont);
     virtual int      GetCharHeight(void) const;
     virtual int      GetCharWidth(void) const;

-    virtual void     GetTextExtent( const wxString& rString
-                                   ,int*            pX
-                                   ,int*            pY
-                                   ,int*            pDescent = (int *)NULL
-                                   ,int*            pExternalLeading = (int *)NULL
-                                   ,const wxFont*   pTheFont = (const wxFont *)NULL
-                                  ) const;
-#if wxUSE_MENUS_NATIVE
-    virtual bool     DoPopupMenu( wxMenu* pMenu
-                                 ,int     nX
-                                 ,int     nY
-                                );
-#endif // wxUSE_MENUS_NATIVE

 
     virtual void     SetScrollbar( int  nOrient
                                   ,int  nPos
 
     virtual void     SetScrollbar( int  nOrient
                                   ,int  nPos


@@ -142,11 +114,11 @@ public:
     virtual int      GetScrollRange(int nOrient) const;
     virtual void     ScrollWindow( int           nDx
                                   ,int           nDy
     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;}
                                  );
 
     inline HWND                   GetScrollBarHorz(void) const {return m_hWndScrollBarHorz;}

-    inline HWND                   GetScrollBarVert(void) const {return m_hWndScrollBarVert;};
+    inline HWND                   GetScrollBarVert(void) const {return m_hWndScrollBarVert;}

 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget(wxDropTarget* pDropTarget);
 #endif // wxUSE_DRAG_AND_DROP
 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget(wxDropTarget* pDropTarget);
 #endif // wxUSE_DRAG_AND_DROP


@@ -178,7 +150,7 @@ public:
     virtual WXWidget GetHandle(void) const { return GetHWND(); }
     bool             GetUseCtl3D(void) const { return m_bUseCtl3D; }
     bool             GetTransparentBackground(void) const { return m_bBackgroundTransparent; }
     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
     // --------------
 
     // event handlers
     // --------------


@@ -188,10 +160,6 @@ public:
 
 public:
 
 
 public:
 

-    // For implementation purposes - sometimes decorations make the client area
-    // smaller
-    virtual wxPoint GetClientAreaOrigin(void) const;
-

     // Windows subclassing
     void SubclassWin(WXHWND hWnd);
     void UnsubclassWin(void);
     // Windows subclassing
     void SubclassWin(WXHWND hWnd);
     void UnsubclassWin(void);


@@ -214,7 +182,7 @@ public:
                                     );
 
     // PM only: true if this control is part of the main control
                                     );
 
     // PM only: true if this control is part of the main control

-    virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; };
+    virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; }

 
     // translate wxWidgets style flags for this control into the PM style
     // and optional extended style for the corresponding native control
 
     // translate wxWidgets style flags for this control into the PM style
     // and optional extended style for the corresponding native control


@@ -238,7 +206,7 @@ public:
 
     // returns true if the window has been created
     bool         OS2Create( PSZ            zClass
 
     // returns true if the window has been created
     bool         OS2Create( PSZ            zClass

-                           ,const char*    zTitle
+                           ,const wxChar*  zTitle

                            ,WXDWORD        dwStyle
                            ,const wxPoint& rPos
                            ,const wxSize&  rSize
                            ,WXDWORD        dwStyle
                            ,const wxPoint& rPos
                            ,const wxSize&  rSize


@@ -433,6 +401,9 @@ public:
     PSWP GetSwp(void) {return &m_vWinSwp;}
 
 protected:
     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
     // PM can't create some MSW styles natively but can perform these after
     // creation by sending messages
     typedef enum extra_flags { kFrameToolWindow = 0x0001


@@ -476,6 +447,19 @@ protected:
     long                            m_lDlgCode;
 
     // implement the base class pure virtuals
     long                            m_lDlgCode;
 
     // implement the base class pure virtuals

+    virtual void     GetTextExtent( const wxString& rString
+                                   ,int*            pX
+                                   ,int*            pY
+                                   ,int*            pDescent = NULL
+                                   ,int*            pExternalLeading = NULL
+                                   ,const wxFont*   pTheFont = NULL
+                                  ) const;
+#if wxUSE_MENUS_NATIVE
+    virtual bool     DoPopupMenu( wxMenu* pMenu
+                                 ,int     nX
+                                 ,int     nY
+                                );
+#endif // wxUSE_MENUS_NATIVE

     virtual void DoClientToScreen( int* pX
                                   ,int* pY
                                  ) const;
     virtual void DoClientToScreen( int* pX
                                   ,int* pY
                                  ) const;


@@ -545,20 +529,13 @@ private:
                               ,WXWPARAM    wParam = 0
                              ) const;
 
                               ,WXWPARAM    wParam = 0
                              ) const;
 

-    wxWindowList*                   m_pChildrenDisabled;

     HWND                            m_hWndScrollBarHorz;
     HWND                            m_hWndScrollBarVert;
     SWP                             m_vWinSwp;
 
     DECLARE_DYNAMIC_CLASS(wxWindowOS2);
     HWND                            m_hWndScrollBarHorz;
     HWND                            m_hWndScrollBarVert;
     SWP                             m_vWinSwp;
 
     DECLARE_DYNAMIC_CLASS(wxWindowOS2);

-    DECLARE_NO_COPY_CLASS(wxWindowOS2)
+    wxDECLARE_NO_COPY_CLASS(wxWindowOS2);

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

-
-    //
-    // Virtual function hiding supression
-    //
-    inline virtual bool Reparent(wxWindowBase* pNewParent)
-    { return(wxWindowBase::Reparent(pNewParent));}

 }; // end of wxWindow
 
 class wxWindowCreationHook
 }; // end of wxWindow
 
 class wxWindowCreationHook


@@ -573,9 +550,9 @@ public:
 // ---------------------------------------------------------------------------
 
 // kbd code translation
 // ---------------------------------------------------------------------------
 
 // kbd code translation

-WXDLLEXPORT int wxCharCodeOS2ToWX(int nKeySym);
-WXDLLEXPORT int wxCharCodeWXToOS2( int   nId
-                                  ,bool* pbIsVirtual
+WXDLLIMPEXP_CORE int wxCharCodeOS2ToWX(int nKeySym);
+WXDLLIMPEXP_CORE int wxCharCodeWXToOS2( int   nId
+                                  ,bool* pbIsVirtual = NULL

                                  );
 
 // ----------------------------------------------------------------------------
                                  );
 
 // ----------------------------------------------------------------------------


@@ -591,5 +568,4 @@ WX_DECLARE_HASH(wxWindowOS2, wxWindowList, wxWinHashTable);
 
 extern wxWinHashTable *wxWinHandleHash;
 
 
 extern wxWinHashTable *wxWinHandleHash;
 

-#endif
-    // _WX_WINDOW_H_
+#endif // _WX_WINDOW_H_