Sorry, should be a __UNIX__ test

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

diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h
index f2a745649dd9923af48a67fde68633bf11fd9882..1bf252de9ad7ac136bb5de99051462867c0eb7c6 100644 (file)
--- a/include/wx/os2/window.h
+++ b/include/wx/os2/window.h
@@ -40,12 +40,14 @@ class WXDLLEXPORT wxButton;
 // constants
 // ---------------------------------------------------------------------------
 
 // constants
 // ---------------------------------------------------------------------------
 

-// FIXME does anybody use those? they're unused by wxWindows...
+#if WXWIN_COMPATIBILITY_2_4
+// they're unused by wxWidgets...

 enum
 {
     wxKEY_SHIFT = 1,
     wxKEY_CTRL  = 2
 };
 enum
 {
     wxKEY_SHIFT = 1,
     wxKEY_CTRL  = 2
 };

+#endif

 
 // ---------------------------------------------------------------------------
 // wxWindow declaration for OS/2 PM
 
 // ---------------------------------------------------------------------------
 // wxWindow declaration for OS/2 PM


@@ -92,15 +94,15 @@ public:
     virtual wxString GetTitle(void) const;
     virtual void     Raise(void);
     virtual void     Lower(void);
     virtual wxString GetTitle(void) const;
     virtual void     Raise(void);
     virtual void     Lower(void);

-    virtual bool     Show(bool bShow = TRUE);
-    virtual bool     Enable(bool bEnable = TRUE);
+    virtual bool     Show(bool bShow = true);
+    virtual bool     Enable(bool bEnable = true);

     virtual void     SetFocus(void);
     virtual void     SetFocusFromKbd(void);
     virtual bool     Reparent(wxWindow* pNewParent);
     virtual void     WarpPointer( int x
                                  ,int y
                                 );
     virtual void     SetFocus(void);
     virtual void     SetFocusFromKbd(void);
     virtual bool     Reparent(wxWindow* pNewParent);
     virtual void     WarpPointer( int x
                                  ,int y
                                 );

-    virtual void     Refresh( bool          bEraseBackground = TRUE
+    virtual void     Refresh( bool          bEraseBackground = true

                              ,const wxRect* pRect = (const wxRect *)NULL
                             );
     virtual void     Freeze(void);
                              ,const wxRect* pRect = (const wxRect *)NULL
                             );
     virtual void     Freeze(void);


@@ -129,11 +131,11 @@ public:
                                   ,int  nPos
                                   ,int  nThumbVisible
                                   ,int  nRange
                                   ,int  nPos
                                   ,int  nThumbVisible
                                   ,int  nRange

-                                  ,bool bRefresh = TRUE
+                                  ,bool bRefresh = true

                                  );
     virtual void     SetScrollPos( int  nOrient
                                   ,int  nPos
                                  );
     virtual void     SetScrollPos( int  nOrient
                                   ,int  nPos

-                                  ,bool bRefresh = TRUE
+                                  ,bool bRefresh = true

                                  );
     virtual int      GetScrollPos(int nOrient) const;
     virtual int      GetScrollThumb(int nOrient) const;
                                  );
     virtual int      GetScrollPos(int nOrient) const;
     virtual int      GetScrollThumb(int nOrient) const;


@@ -176,7 +178,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             SetTransparent(bool bT = true) { m_bBackgroundTransparent = bT; }

 
     // event handlers
     // --------------
 
     // event handlers
     // --------------


@@ -186,10 +188,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);


@@ -197,28 +195,24 @@ public:
     WXFARPROC OS2GetOldWndProc(void) const { return m_fnOldWndProc; }
     void OS2SetOldWndProc(WXFARPROC fnProc) { m_fnOldWndProc = fnProc; }
     //
     WXFARPROC OS2GetOldWndProc(void) const { return m_fnOldWndProc; }
     void OS2SetOldWndProc(WXFARPROC fnProc) { m_fnOldWndProc = fnProc; }
     //

-    // Return TRUE if the window is of a standard (i.e. not wxWindows') class
+    // Return true if the window is of a standard (i.e. not wxWidgets') class

     //
     bool IsOfStandardClass(void) const { return m_fnOldWndProc != NULL; }
 
     wxWindow* FindItem(long lId) const;
     wxWindow* FindItemByHWND( WXHWND hWnd
     //
     bool IsOfStandardClass(void) const { return m_fnOldWndProc != NULL; }
 
     wxWindow* FindItem(long lId) const;
     wxWindow* FindItemByHWND( WXHWND hWnd

-                             ,bool   bControlOnly = FALSE
+                             ,bool   bControlOnly = false

                             ) const;
 
                             ) const;
 

-    // Make a Windows extended style from the given wxWindows window style ?? applicable to OS/2??
+    // Make a Windows extended style from the given wxWidgets window style ?? applicable to OS/2??

     static WXDWORD MakeExtendedStyle( long lStyle
     static WXDWORD MakeExtendedStyle( long lStyle

-                                     ,bool bEliminateBorders = TRUE
+                                     ,bool bEliminateBorders = true

                                     );
                                     );

-    // Determine whether 3D effects are wanted
-    WXDWORD Determine3DEffects( WXDWORD dwDefaultBorderStyle
-                               ,bool*   pbWant3D
-                              ) const;

 
 

-    // PM only: TRUE if this control is part of the main control
-    virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return FALSE; };
+    // PM only: true if this control is part of the main control
+    virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; };

 
 

-    // translate wxWindows style flags for this control into the PM style
+    // translate wxWidgets style flags for this control into the PM style

     // and optional extended style for the corresponding native control
     //
     // this is the function that should be overridden in the derived classes,
     // and optional extended style for the corresponding native control
     //
     // this is the function that should be overridden in the derived classes,


@@ -227,7 +221,7 @@ public:
                                 ,WXDWORD* pdwExstyle = NULL
                                ) const;
 
                                 ,WXDWORD* pdwExstyle = NULL
                                ) const;
 

-    // get the MSW window flags corresponding to wxWindows ones
+    // get the MSW window flags corresponding to wxWidgets ones

     //
     // the functions returns the flags (WS_XXX) directly and puts the ext
     // (WS_EX_XXX) flags into the provided pointer if not NULL
     //
     // the functions returns the flags (WS_XXX) directly and puts the ext
     // (WS_EX_XXX) flags into the provided pointer if not NULL


@@ -238,7 +232,7 @@ public:
     // get the HWND to be used as parent of this window with CreateWindow()
     virtual WXHWND OS2GetParent(void) const;
 
     // get the HWND to be used as parent of this window with CreateWindow()
     virtual WXHWND OS2GetParent(void) const;
 

-    // returns TRUE if the window has been created
+    // returns true if the window has been created

     bool         OS2Create( PSZ            zClass
                            ,const char*    zTitle
                            ,WXDWORD        dwStyle
     bool         OS2Create( PSZ            zClass
                            ,const char*    zTitle
                            ,WXDWORD        dwStyle


@@ -297,7 +291,7 @@ public:
 
     // ------------------------------------------------------------------------
     // internal handlers for OS2 messages: all handlers return a boolen value:
 
     // ------------------------------------------------------------------------
     // internal handlers for OS2 messages: all handlers return a boolen value:

-    // TRUE means that the handler processed the event and FALSE that it didn't
+    // true means that the handler processed the event and false that it didn't

     // ------------------------------------------------------------------------
 
     // there are several cases where we have virtual functions for PM
     // ------------------------------------------------------------------------
 
     // there are several cases where we have virtual functions for PM


@@ -373,7 +367,7 @@ public:
                         );
     bool HandleChar( WXWPARAM wParam
                     ,WXLPARAM lParam
                         );
     bool HandleChar( WXWPARAM wParam
                     ,WXLPARAM lParam

-                    ,bool     bIsASCII = FALSE
+                    ,bool     bIsASCII = false

                    );
     bool HandleKeyDown( WXWPARAM wParam
                        ,WXLPARAM lParam
                    );
     bool HandleKeyDown( WXWPARAM wParam
                        ,WXLPARAM lParam


@@ -579,5 +573,19 @@ WXDLLEXPORT int wxCharCodeOS2ToWX(int nKeySym);
 WXDLLEXPORT int wxCharCodeWXToOS2( int   nId
                                   ,bool* pbIsVirtual
                                  );
 WXDLLEXPORT int wxCharCodeWXToOS2( int   nId
                                   ,bool* pbIsVirtual
                                  );

+
+// ----------------------------------------------------------------------------
+// global objects
+// ----------------------------------------------------------------------------
+
+// notice that this hash must be defined after wxWindow declaration as it
+// needs to "see" its dtor and not just forward declaration
+#include "wx/hash.h"
+
+// pseudo-template HWND <-> wxWindow hash table
+WX_DECLARE_HASH(wxWindowOS2, wxWindowList, wxWinHashTable);
+
+extern wxWinHashTable *wxWinHandleHash;
+

 #endif
     // _WX_WINDOW_H_
 #endif
     // _WX_WINDOW_H_