set eol-style

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

diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h
index f18fc3eeaad51dc750652b8efbb76f063936ab4c..9070497a445464e3b2e23fa60af236194183eae2 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,20 +34,7 @@
 // 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


@@ -90,12 +77,12 @@ 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 bool     Reparent(wxWindow* pNewParent);
     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; }
     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 +175,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);


@@ -238,7 +221,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


@@ -545,7 +528,6 @@ private:
                               ,WXWPARAM    wParam = 0
                              ) const;
 
                               ,WXWPARAM    wParam = 0
                              ) const;
 

-    wxWindowList*                   m_pChildrenDisabled;

     HWND                            m_hWndScrollBarHorz;
     HWND                            m_hWndScrollBarVert;
     SWP                             m_vWinSwp;
     HWND                            m_hWndScrollBarHorz;
     HWND                            m_hWndScrollBarVert;
     SWP                             m_vWinSwp;


@@ -575,7 +557,7 @@ public:
 // kbd code translation
 WXDLLEXPORT int wxCharCodeOS2ToWX(int nKeySym);
 WXDLLEXPORT int wxCharCodeWXToOS2( int   nId
 // kbd code translation
 WXDLLEXPORT int wxCharCodeOS2ToWX(int nKeySym);
 WXDLLEXPORT int wxCharCodeWXToOS2( int   nId

-                                  ,bool* pbIsVirtual
+                                  ,bool* pbIsVirtual = NULL

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


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

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