Headers to support 'Y' positioning fixes for OS/2 controls

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/os2/radiobox.h b/include/wx/os2/radiobox.h
index 0e6d7b022a3b0e69e3b47ab2273560c7245f42af..d6fe35c359ff6f41753c12d122668f4a38b914a6 100644 (file)
--- a/include/wx/os2/radiobox.h
+++ b/include/wx/os2/radiobox.h
@@ -115,12 +115,12 @@ public:
                    void     GetSize( int* pnX
                                     ,int* pnY
                                    ) const;
-                   void     GetSizeFlags(void) const;
+    inline         int      GetSizeFlags(void) const { return m_nSizeFlags; }
                    void     AdjustButtons( int nX
                                           ,int nY
                                           ,int nWidth
                                           ,int nHeight
-                                          ,int lSizeFlags
+                                          ,int nSizeFlags
                                          );
                    wxString GetString(int nIndex) const;
            virtual wxString GetStringSelection(void) const;
@@ -146,12 +146,6 @@ public:
 
 
 protected:
-            void   AdjustButtons( int  nX
-                               ,int  nY
-                               ,int  nWidth
-                               ,int  nHeight
-                               ,long lSizeFlags
-                              );
     virtual wxSize DoGetBestSize(void) const;
     virtual void   DoSetSize( int nX
                              ,int nY

diff --git a/include/wx/os2/slider.h b/include/wx/os2/slider.h
index 66b9b282be16078134b73b2d0ba047dfe745f286..782436634ebf30e1377752c07dea5bce311adc91 100644 (file)
--- a/include/wx/os2/slider.h
+++ b/include/wx/os2/slider.h
@@ -113,6 +113,13 @@ public:
     inline         WXHWND   GetStaticMax(void) const { return m_hStaticMax; }
     inline         WXHWND   GetEditValue(void) const { return m_hStaticValue; }
            virtual bool     ContainsHWND(WXHWND hWnd) const;
+                   void     AdjustSubControls( int  nX
+                                              ,int  nY
+                                              ,int  nWidth
+                                              ,int  nHeight
+                                              ,int  nSizeFlags
+                                             );
+    inline         int      GetSizeFlags(void) { return m_nSizeFlags; }
                    void     Command(wxCommandEvent& rEvent);
            virtual WXHBRUSH OnCtlColor( WXHDC    hDC
                                        ,WXHWND   hWnd
@@ -138,6 +145,7 @@ protected:
     int                             m_nTickFreq;
     double                          m_dPixelToRange;
     int                             m_nThumbLength;
+    int                             m_nSizeFlags;
 
     virtual void DoSetSize( int  nX
                            ,int  nY

diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h
index a230da8ad271b05d4ac08244a71f40a0a91c149b..90027e55c65ed37052728ace66ad3a9277a69d95 100644 (file)
--- a/include/wx/os2/window.h
+++ b/include/wx/os2/window.h
@@ -441,6 +441,8 @@ public:
                         ,WXUINT        uFlags
                        );
 
+    void MoveChildren(int nDiff);
+
 protected:
     // PM can't create some MSW styles natively but can perform these after
     // creation by sending messages
@@ -524,6 +526,8 @@ protected:
     virtual void DoSetToolTip(wxToolTip* pTip);
 #endif // wxUSE_TOOLTIPS
 
+    int  GetOS2ParentHeight(wxWindowOS2* pParent);
+
 private:
     // common part of all ctors
     void Init(void);