Carbon-Standard conversion

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

diff --git a/include/wx/os2/slider.h b/include/wx/os2/slider.h
index 66b9b282be16078134b73b2d0ba047dfe745f286..887177c827ace0303dc197ee26fe32d57b0813ee 100644 (file)
--- a/include/wx/os2/slider.h
+++ b/include/wx/os2/slider.h
@@ -14,8 +14,6 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
-

 // Slider
 class WXDLLEXPORT wxSlider: public wxSliderBase
 {
 // Slider
 class WXDLLEXPORT wxSlider: public wxSliderBase
 {


@@ -68,6 +66,9 @@ public:
          virtual int  GetValue(void) const ;
          virtual void SetValue(int);
 
          virtual int  GetValue(void) const ;
          virtual void SetValue(int);
 

+         virtual void DoGetSize( int* pnWidth
+                                ,int* pnHeight
+                               ) const;

                  void GetSize( int* pnX
                               ,int* pnY
                              ) const;
                  void GetSize( int* pnX
                               ,int* pnY
                              ) const;


@@ -113,6 +114,13 @@ public:
     inline         WXHWND   GetStaticMax(void) const { return m_hStaticMax; }
     inline         WXHWND   GetEditValue(void) const { return m_hStaticValue; }
            virtual bool     ContainsHWND(WXHWND hWnd) const;
     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
                    void     Command(wxCommandEvent& rEvent);
            virtual WXHBRUSH OnCtlColor( WXHDC    hDC
                                        ,WXHWND   hWnd


@@ -138,6 +146,7 @@ protected:
     int                             m_nTickFreq;
     double                          m_dPixelToRange;
     int                             m_nThumbLength;
     int                             m_nTickFreq;
     double                          m_dPixelToRange;
     int                             m_nThumbLength;

+    int                             m_nSizeFlags;

 
     virtual void DoSetSize( int  nX
                            ,int  nY
 
     virtual void DoSetSize( int  nX
                            ,int  nY