fixed typo in wxString::swap() which was completely broken

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

diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h
index 9d22bad4e7d32150791071e62f09d92ee9b6486e..33ac3ce48baf5fe63d9f922b58219e34add3ba44 100644 (file)
--- a/include/wx/os2/window.h
+++ b/include/wx/os2/window.h
@@ -23,6 +23,13 @@
 #include <os2.h>
 
 
 #include <os2.h>
 
 

+// ---------------------------------------------------------------------------
+// forward declarations
+// ---------------------------------------------------------------------------
+#ifndef CW_USEDEFAULT
+#  define  CW_USEDEFAULT ((int)0x80000000)
+#endif
+

 // ---------------------------------------------------------------------------
 // forward declarations
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // forward declarations
 // ---------------------------------------------------------------------------


@@ -44,21 +51,21 @@ enum
 // wxWindow declaration for OS/2 PM
 // ---------------------------------------------------------------------------
 
 // wxWindow declaration for OS/2 PM
 // ---------------------------------------------------------------------------
 

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

 {
 public:
 {
 public:

-    wxWindow()
+    wxWindowOS2()

     {
         Init();
     }
 
     {
         Init();
     }
 

-    wxWindow( wxWindow*       pParent
-             ,wxWindowID      vId
-             ,const wxPoint&  rPos = wxDefaultPosition
-             ,const wxSize&   rSize = wxDefaultSize
-             ,long            lStyle = 0
-             ,const wxString& rName = wxPanelNameStr
-            )
+    wxWindowOS2( wxWindow*       pParent
+                ,wxWindowID      vId
+                ,const wxPoint&  rPos = wxDefaultPosition
+                ,const wxSize&   rSize = wxDefaultSize
+                ,long            lStyle = 0
+                ,const wxString& rName = wxPanelNameStr
+               )

     {
         Init();
         Create( pParent
     {
         Init();
         Create( pParent


@@ -70,7 +77,7 @@ public:
               );
     }
 
               );
     }
 

-    virtual ~wxWindow();
+    virtual ~wxWindowOS2();

 
     bool Create( wxWindow*       pParent
                 ,wxWindowID      vId
 
     bool Create( wxWindow*       pParent
                 ,wxWindowID      vId


@@ -92,12 +99,14 @@ public:
     virtual void     WarpPointer( int x
                                  ,int y
                                 );
     virtual void     WarpPointer( int x
                                  ,int y
                                 );

-    virtual void     CaptureMouse(void);
-    virtual void     ReleaseMouse(void);

     virtual void     Refresh( bool          bEraseBackground = TRUE
                              ,const wxRect* pRect = (const wxRect *)NULL
                             );
     virtual void     Clear(void);
     virtual void     Refresh( bool          bEraseBackground = TRUE
                              ,const wxRect* pRect = (const wxRect *)NULL
                             );
     virtual void     Clear(void);

+    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);
     virtual int      GetCharHeight(void) const;
     virtual bool     SetCursor(const wxCursor& rCursor);
     virtual bool     SetFont(const wxFont& rFont);
     virtual int      GetCharHeight(void) const;


@@ -109,10 +118,12 @@ public:
                                    ,int*            pExternalLeading = (int *)NULL
                                    ,const wxFont*   pTheFont = (const wxFont *)NULL
                                   ) const;
                                    ,int*            pExternalLeading = (int *)NULL
                                    ,const wxFont*   pTheFont = (const wxFont *)NULL
                                   ) const;

+#if wxUSE_MENUS_NATIVE

     virtual bool     DoPopupMenu( wxMenu* pMenu
                                  ,int     nX
                                  ,int     nY
                                 );
     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


@@ -132,6 +143,8 @@ public:
                                   ,const wxRect* pRect = (wxRect *)NULL
                                  );
 
                                   ,const wxRect* pRect = (wxRect *)NULL
                                  );
 

+    inline HWND                   GetScrollBarHorz(void) const {return m_hWndScrollBarHorz;}
+    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


@@ -180,6 +193,7 @@ public:
                     ) const;
 #endif // wxUSE_CARET
 
                     ) const;
 #endif // wxUSE_CARET
 

+#ifndef __WXUNIVERSAL__

     // Native resource loading (implemented in src/os2/nativdlg.cpp)
     // FIXME: should they really be all virtual?
     virtual bool LoadNativeDialog( wxWindow*   pParent
     // Native resource loading (implemented in src/os2/nativdlg.cpp)
     // FIXME: should they really be all virtual?
     virtual bool LoadNativeDialog( wxWindow*   pParent


@@ -190,6 +204,7 @@ public:
                                  );
     wxWindow*    GetWindowChild1(wxWindowID vId);
     wxWindow*    GetWindowChild(wxWindowID vId);
                                  );
     wxWindow*    GetWindowChild1(wxWindowID vId);
     wxWindow*    GetWindowChild(wxWindowID vId);

+#endif //__WXUNIVERSAL__

 
     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------


@@ -215,13 +230,6 @@ public:
     // smaller
     virtual wxPoint GetClientAreaOrigin(void) const;
 
     // smaller
     virtual wxPoint GetClientAreaOrigin(void) const;
 

-    // Makes an adjustment to the window position (for example, a frame that has
-    // a toolbar that it manages itself).
-    virtual void AdjustForParentClientOrigin( int& rX
-                                             ,int& rY
-                                             ,int  nSizeFlags
-                                            );
-

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


@@ -246,21 +254,33 @@ public:
     // 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
+    // and optional extended style for the corresponding native control
+    //
+    // this is the function that should be overridden in the derived classes,
+    // but you will mostly use OS2GetCreateWindowFlags() below
+    virtual WXDWORD OS2GetStyle( long     lFlags
+                                ,WXDWORD* pdwExstyle = NULL
+                               ) const;
+
+    // get the MSW window flags corresponding to wxWindows ones
+    //
+    // the functions returns the flags (WS_XXX) directly and puts the ext
+    // (WS_EX_XXX) flags into the provided pointer if not NULL
+    WXDWORD OS2GetCreateWindowFlags(WXDWORD* pdwExflags = NULL) const
+        { return OS2GetStyle(GetWindowStyle(), pdwExflags); }
+
+

     // returns TRUE if the window has been created
     // returns TRUE if the window has been created

-    bool OS2Create( WXHWND        hParent
-                   ,PSZ           zClass
-                   ,const wxChar* zTitle
-                   ,WXDWORD       dwStyle
-                   ,long          lX
-                   ,long          lY
-                   ,long          lWidth
-                   ,long          lHeight
-                   ,WXHWND        hOwner
-                   ,WXHWND        hZOrder
-                   ,unsigned long lId
-                   ,void*         pCtlData = NULL
-                   ,void*         pPresParams = NULL
-                  );
+    bool         OS2Create( PSZ            zClass
+                           ,const char*    zTitle
+                           ,WXDWORD        dwStyle
+                           ,const wxPoint& rPos
+                           ,const wxSize&  rSize
+                           ,void*          pCtlData
+                           ,WXDWORD        dwExStyle
+                           ,bool           bIsChild
+                          );

     virtual bool OS2Command( WXUINT uParam
                             ,WXWORD nId
                            );
     virtual bool OS2Command( WXUINT uParam
                             ,WXWORD nId
                            );


@@ -272,6 +292,7 @@ public:
                                    ) const;
 #endif // WXWIN_COMPATIBILITY
 
                                    ) const;
 #endif // WXWIN_COMPATIBILITY
 

+#ifndef __WXUNIVERSAL__

     // Create an appropriate wxWindow from a HWND
     virtual wxWindow* CreateWindowFromHWND( wxWindow* pParent
                                            ,WXHWND    hWnd
     // Create an appropriate wxWindow from a HWND
     virtual wxWindow* CreateWindowFromHWND( wxWindow* pParent
                                            ,WXHWND    hWnd


@@ -279,6 +300,7 @@ public:
 
     // Make sure the window style reflects the HWND style (roughly)
     virtual void AdoptAttributesFromHWND(void);
 
     // Make sure the window style reflects the HWND style (roughly)
     virtual void AdoptAttributesFromHWND(void);

+#endif

 
     // Setup background and foreground colours correctly
     virtual void SetupColours(void);
 
     // Setup background and foreground colours correctly
     virtual void SetupColours(void);


@@ -368,12 +390,12 @@ public:
     bool HandleSysCommand( WXWPARAM wParam
                           ,WXLPARAM lParam
                          );
     bool HandleSysCommand( WXWPARAM wParam
                           ,WXLPARAM lParam
                          );

-    bool HandleWindowParams( PWNDPARAMS pParams
-                            ,WXLPARAM   lParam
-                           );
-    bool HandlePaletteChanged();
-    bool HandlePresParamChanged(WXWPARAM wParam);
+    bool HandlePaletteChanged(void);
+    bool HandleQueryNewPalette(void);

     bool HandleSysColorChange(void);
     bool HandleSysColorChange(void);

+    bool HandleDisplayChange(void);
+    bool HandleCaptureChanged(WXHWND hBainedCapture);
+

     bool HandleCtlColor(WXHBRUSH* hBrush);
     bool HandleSetFocus(WXHWND hWnd);
     bool HandleKillFocus(WXHWND hWnd);
     bool HandleCtlColor(WXHBRUSH* hBrush);
     bool HandleSetFocus(WXHWND hWnd);
     bool HandleKillFocus(WXHWND hWnd);


@@ -387,14 +409,14 @@ public:
                          ,int    nY
                          ,WXUINT uFlags
                         );
                          ,int    nY
                          ,WXUINT uFlags
                         );

-    bool HandleChar( WXWORD   wParam
+    bool HandleChar( WXWPARAM wParam

                     ,WXLPARAM lParam
                     ,bool     bIsASCII = FALSE
                    );
                     ,WXLPARAM lParam
                     ,bool     bIsASCII = FALSE
                    );

-    bool HandleKeyDown( WXWORD   wParam
+    bool HandleKeyDown( WXWPARAM wParam

                        ,WXLPARAM lParam
                       );
                        ,WXLPARAM lParam
                       );

-    bool HandleKeyUp( WXWORD   wParam
+    bool HandleKeyUp( WXWPARAM wParam

                      ,WXLPARAM lParam
                     );
     bool HandleQueryDragIcon(WXHICON* phIcon);
                      ,WXLPARAM lParam
                     );
     bool HandleQueryDragIcon(WXHICON* phIcon);


@@ -402,6 +424,15 @@ public:
                          ,WXHWND hWnd
                         );
 
                          ,WXHWND hWnd
                         );
 

+    bool IsMouseInWindow(void) const;
+    bool OS2GetCreateWindowCoords( const wxPoint& rPos
+                                  ,const wxSize&  rSize
+                                  ,int&           rnX
+                                  ,int&           rnY
+                                  ,int&           rnWidth
+                                  ,int&           rnHeight
+                                 ) const;
+

     // Window procedure
     virtual MRESULT OS2WindowProc( WXUINT   uMsg
                                   ,WXWPARAM wParam
     // Window procedure
     virtual MRESULT OS2WindowProc( WXUINT   uMsg
                                   ,WXWPARAM wParam


@@ -414,12 +445,10 @@ public:
                                      ,WXLPARAM lParam
                                     );
     virtual bool    OS2ProcessMessage(WXMSG* pMsg);
                                      ,WXLPARAM lParam
                                     );
     virtual bool    OS2ProcessMessage(WXMSG* pMsg);

+    virtual bool    OS2ShouldPreProcessMessage(WXMSG* pMsg);

     virtual bool    OS2TranslateMessage(WXMSG* pMsg);
     virtual void    OS2DestroyWindow(void);
 
     virtual bool    OS2TranslateMessage(WXMSG* pMsg);
     virtual void    OS2DestroyWindow(void);
 

-    // Detach "Window" menu from menu bar so it doesn't get deleted
-    void OS2DetachWindowMenu(void);
-

     // this function should return the brush to paint the window background
     // with or 0 for the default brush
     virtual WXHBRUSH OnCtlColor( WXHDC    hDC
     // this function should return the brush to paint the window background
     // with or 0 for the default brush
     virtual WXHBRUSH OnCtlColor( WXHDC    hDC


@@ -445,6 +474,9 @@ public:
                         ,WXUINT        uFlags
                        );
 
                         ,WXUINT        uFlags
                        );
 

+    void MoveChildren(int nDiff);
+    PSWP GetSwp(void) {return &m_vWinSwp;}
+

 protected:
     // PM can't create some MSW styles natively but can perform these after
     // creation by sending messages
 protected:
     // PM can't create some MSW styles natively but can perform these after
     // creation by sending messages


@@ -463,12 +495,14 @@ protected:
     // the old window proc (we subclass all windows)
     WXFARPROC                       m_fnOldWndProc;
 
     // the old window proc (we subclass all windows)
     WXFARPROC                       m_fnOldWndProc;
 

-    // additional (MSW specific) flags
+    // additional (OS2 specific) flags

     bool                            m_bUseCtl3D:1; // Using CTL3D for this control
     bool                            m_bBackgroundTransparent:1;
     bool                            m_bMouseInWindow:1;
     bool                            m_bDoubleClickAllowed: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;
     bool                            m_bWinCaptured:1;

+    WXDWORD                         m_dwExStyle;

 
     // the size of one page for scrolling
     int                             m_nXThumbSize;
 
     // the size of one page for scrolling
     int                             m_nXThumbSize;


@@ -513,6 +547,9 @@ protected:
                                  ,int nHeight
                                 );
 
                                  ,int nHeight
                                 );
 

+    virtual void     DoCaptureMouse(void);
+    virtual void     DoReleaseMouse(void);
+

     // move the window to the specified location and resize it: this is called
     // from both DoSetSize() and DoSetClientSize() and would usually just call
     // ::WinSetWindowPos() except for composite controls which will want to arrange
     // move the window to the specified location and resize it: this is called
     // from both DoSetSize() and DoSetClientSize() and would usually just call
     // ::WinSetWindowPos() except for composite controls which will want to arrange


@@ -527,6 +564,8 @@ protected:
     virtual void DoSetToolTip(wxToolTip* pTip);
 #endif // wxUSE_TOOLTIPS
 
     virtual void DoSetToolTip(wxToolTip* pTip);
 #endif // wxUSE_TOOLTIPS
 

+    int  GetOS2ParentHeight(wxWindowOS2* pParent);
+

 private:
     // common part of all ctors
     void Init(void);
 private:
     // common part of all ctors
     void Init(void);


@@ -546,17 +585,34 @@ private:
                       ,WXLPARAM* pResult
                      );
     // the helper functions used by HandleChar/KeyXXX methods
                       ,WXLPARAM* pResult
                      );
     // the helper functions used by HandleChar/KeyXXX methods

-    wxKeyEvent CreateKeyEvent(wxEventType evType, int id, WXLPARAM lp) const;
+    wxKeyEvent CreateKeyEvent( wxEventType evType
+                              ,int         nId
+                              ,WXLPARAM    lParam = 0
+                              ,WXWPARAM    wParam = 0
+                             ) const;

 
 

-    DECLARE_DYNAMIC_CLASS(wxWindow);
-    DECLARE_NO_COPY_CLASS(wxWindow);
+
+    DECLARE_DYNAMIC_CLASS(wxWindowOS2);
+    DECLARE_NO_COPY_CLASS(wxWindowOS2)

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+

 private:
 private:

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

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

+class wxWindowCreationHook
+{
+public:
+    wxWindowCreationHook(wxWindow* pWinBeingCreated);
+    ~wxWindowCreationHook();
+}; // end of CLASS wxWindowCreationHook
+

 // ---------------------------------------------------------------------------
 // global functions
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // global functions
 // ---------------------------------------------------------------------------