wxLaunchDefaultBrowser() now supports wxBROWSER_NEW_WINDOW flag (and it actually...

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

diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h
index 33ac3ce48baf5fe63d9f922b58219e34add3ba44..4f68d8252925733d73cf45b2669244864eec889e 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,17 +94,17 @@ 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     SetFocus(void);

+    virtual void     SetFocusFromKbd(void);

     virtual bool     Reparent(wxWindow* pNewParent);
     virtual void     WarpPointer( int x
                                  ,int y
                                 );
     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
                             );
                              ,const wxRect* pRect = (const wxRect *)NULL
                             );

-    virtual void     Clear(void);

     virtual void     Freeze(void);
     virtual void     Update(void);
     virtual void     Thaw(void);
     virtual void     Freeze(void);
     virtual void     Update(void);
     virtual void     Thaw(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;


@@ -152,47 +154,6 @@ public:
     // Accept files for dragging
     virtual void DragAcceptFiles(bool bAccept);
 
     // Accept files for dragging
     virtual void DragAcceptFiles(bool bAccept);
 

-#if WXWIN_COMPATIBILITY
-    // Set/get scroll attributes
-    virtual void SetScrollRange( int  nOrient
-                                ,int  nRange
-                                ,bool bRefresh = TRUE
-                               );
-    virtual void SetScrollPage( int  nOrient
-                               ,int  nPage
-                               ,bool bRefresh = TRUE
-                              );
-    virtual int  OldGetScrollRange(int nOrient) const;
-    virtual int  GetScrollPage(int nOrient) const;
-
-    //
-    // event handlers
-    //
-        // Handle a control command
-    virtual void OnCommand( wxWindow&       rWin
-                           ,wxCommandEvent& rEvent
-                          );
-
-        // Override to define new behaviour for default action (e.g. double
-        // clicking on a listbox)
-    virtual void OnDefaultAction(wxControl* WXUNUSED(pInitiatingItem)) { }
-#endif // WXWIN_COMPATIBILITY
-
-#if wxUSE_CARET && WXWIN_COMPATIBILITY
-    void CreateCaret( int nWidth
-                     ,int nHeight
-                    );
-    void CreateCaret(const wxBitmap* pBitmap);
-    void DestroyCaret(void);
-    void ShowCaret(bool bShow);
-    void SetCaretPos( int nX
-                     ,int nY
-                    );
-    void GetCaretPos( int* pX
-                     ,int* pY
-                    ) const;
-#endif // wxUSE_CARET
-

 #ifndef __WXUNIVERSAL__
     // Native resource loading (implemented in src/os2/nativdlg.cpp)
     // FIXME: should they really be all virtual?
 #ifndef __WXUNIVERSAL__
     // Native resource loading (implemented in src/os2/nativdlg.cpp)
     // FIXME: should they really be all virtual?


@@ -217,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
     // --------------


@@ -226,9 +187,6 @@ public:
     void OnIdle(wxIdleEvent& rEvent);
 
 public:
     void OnIdle(wxIdleEvent& rEvent);
 
 public:

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

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


@@ -236,25 +194,25 @@ 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 wxWidgets') class
+    //
+    bool IsOfStandardClass(void) const { return m_fnOldWndProc != NULL; }

 
     wxWindow* FindItem(long lId) const;
     wxWindow* FindItemByHWND( WXHWND hWnd
 
     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,


@@ -263,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


@@ -271,9 +229,12 @@ public:
         { return OS2GetStyle(GetWindowStyle(), pdwExflags); }
 
 
         { return OS2GetStyle(GetWindowStyle(), pdwExflags); }
 
 

-    // returns TRUE if the window has been created
+    // 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

     bool         OS2Create( PSZ            zClass
     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


@@ -285,13 +246,6 @@ public:
                             ,WXWORD nId
                            );
 
                             ,WXWORD nId
                            );
 

-#if WXWIN_COMPATIBILITY
-    wxObject*    GetChild(int nNumber) const;
-    virtual void OS2DeviceToLogical( float* pfX
-                                    ,float* pfY
-                                   ) const;
-#endif // WXWIN_COMPATIBILITY
-

 #ifndef __WXUNIVERSAL__
     // Create an appropriate wxWindow from a HWND
     virtual wxWindow* CreateWindowFromHWND( wxWindow* pParent
 #ifndef __WXUNIVERSAL__
     // Create an appropriate wxWindow from a HWND
     virtual wxWindow* CreateWindowFromHWND( wxWindow* pParent


@@ -337,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


@@ -358,10 +312,12 @@ public:
     virtual bool OS2OnDrawItem( int               nId
                                ,WXDRAWITEMSTRUCT* pItem
                               );
     virtual bool OS2OnDrawItem( int               nId
                                ,WXDRAWITEMSTRUCT* pItem
                               );

-    virtual bool OS2OnMeasureItem( int                  nId
+    virtual long OS2OnMeasureItem( int                  nId

                                   ,WXMEASUREITEMSTRUCT* pItem
                                  );
 
                                   ,WXMEASUREITEMSTRUCT* pItem
                                  );
 

+    virtual void OnPaint(wxPaintEvent& rEvent);
+

     // the rest are not virtual
     bool HandleCreate( WXLPCREATESTRUCT vCs
                       ,bool*            pMayCreate
     // the rest are not virtual
     bool HandleCreate( WXLPCREATESTRUCT vCs
                       ,bool*            pMayCreate


@@ -411,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


@@ -459,11 +415,6 @@ public:
                                 ,WXLPARAM lParam
                                );
 
                                 ,WXLPARAM lParam
                                );
 

-#if WXWIN_COMPATIBILITY
-    void SetShowing(bool bShow) { (void)Show(show); }
-    bool IsUserEnabled(void) const { return IsEnabled(); }
-#endif // WXWIN_COMPATIBILITY
-

     // Responds to colour changes: passes event on to children.
     void OnSysColourChanged(wxSysColourChangedEvent& rEvent);
 
     // Responds to colour changes: passes event on to children.
     void OnSysColourChanged(wxSysColourChangedEvent& rEvent);
 


@@ -499,7 +450,6 @@ protected:
     bool                            m_bUseCtl3D:1; // Using CTL3D for this control
     bool                            m_bBackgroundTransparent:1;
     bool                            m_bMouseInWindow:1;
     bool                            m_bUseCtl3D:1; // Using CTL3D for this control
     bool                            m_bBackgroundTransparent:1;
     bool                            m_bMouseInWindow:1;

-    bool                            m_bDoubleClickAllowed:1;

     bool                            m_bLastKeydownProcessed:1;
     bool                            m_bWinCaptured:1;
     WXDWORD                         m_dwExStyle;
     bool                            m_bLastKeydownProcessed:1;
     bool                            m_bWinCaptured:1;
     WXDWORD                         m_dwExStyle;


@@ -591,19 +541,20 @@ 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);
     DECLARE_NO_COPY_CLASS(wxWindowOS2)
     DECLARE_EVENT_TABLE()
 
 
     DECLARE_DYNAMIC_CLASS(wxWindowOS2);
     DECLARE_NO_COPY_CLASS(wxWindowOS2)
     DECLARE_EVENT_TABLE()
 

-private:
-    HWND                            m_hWndScrollBarHorz;
-    HWND                            m_hWndScrollBarVert;
-    SWP                             m_vWinSwp;
-
+    //

     // Virtual function hiding supression
     // Virtual function hiding supression

+    //

     inline virtual bool Reparent(wxWindowBase* pNewParent)
     inline virtual bool Reparent(wxWindowBase* pNewParent)

-    { return(wxWindowBase::Reparent(pNewParent));};
+    { return(wxWindowBase::Reparent(pNewParent));}

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


@@ -622,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_