compilation fixes

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

diff --git a/include/wx/gtk/slider.h b/include/wx/gtk/slider.h
index 651950e5e0350adbe6eae7b721492eb6ffd2fed7..b2400ebc3c7677cb945d7136edf423abf7976de1 100644 (file)
--- a/include/wx/gtk/slider.h
+++ b/include/wx/gtk/slider.h
@@ -41,7 +41,7 @@ extern const char *wxSliderNameStr;
 class wxSlider: public wxControl
 {
 public:
 class wxSlider: public wxControl
 {
 public:

-    wxSlider() {}
+    wxSlider();

     inline wxSlider( wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,
     inline wxSlider( wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,


@@ -52,12 +52,13 @@ public:
     {
       Create( parent, id, value, minValue, maxValue, pos, size, style, validator, name );
     }
     {
       Create( parent, id, value, minValue, maxValue, pos, size, style, validator, name );
     }

+    ~wxSlider();

     bool Create(wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSL_HORIZONTAL,
     bool Create(wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSL_HORIZONTAL,

-           const wxValidator& validator = wxDefaultValidator, 
+           const wxValidator& validator = wxDefaultValidator,

            const wxString& name = wxSliderNameStr );
     virtual int GetValue() const;
     virtual void SetValue( int );
            const wxString& name = wxSliderNameStr );
     virtual int GetValue() const;
     virtual void SetValue( int );


@@ -79,15 +80,15 @@ public:
     int GetThumbLength() const;
     void SetTick( int tickPos );
 
     int GetThumbLength() const;
     void SetTick( int tickPos );
 

-    // implementation    
+    // implementation

     // --------------
     // --------------

-    
+

     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();

-    
+

     GtkAdjustment  *m_adjust;
     float           m_oldPos;
     GtkAdjustment  *m_adjust;
     float           m_oldPos;

-    
+

 private:
     DECLARE_DYNAMIC_CLASS(wxSlider)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxSlider)
 };

diff --git a/include/wx/gtk1/slider.h b/include/wx/gtk1/slider.h
index 651950e5e0350adbe6eae7b721492eb6ffd2fed7..b2400ebc3c7677cb945d7136edf423abf7976de1 100644 (file)
--- a/include/wx/gtk1/slider.h
+++ b/include/wx/gtk1/slider.h
@@ -41,7 +41,7 @@ extern const char *wxSliderNameStr;
 class wxSlider: public wxControl
 {
 public:
 class wxSlider: public wxControl
 {
 public:

-    wxSlider() {}
+    wxSlider();

     inline wxSlider( wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,
     inline wxSlider( wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,


@@ -52,12 +52,13 @@ public:
     {
       Create( parent, id, value, minValue, maxValue, pos, size, style, validator, name );
     }
     {
       Create( parent, id, value, minValue, maxValue, pos, size, style, validator, name );
     }

+    ~wxSlider();

     bool Create(wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSL_HORIZONTAL,
     bool Create(wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSL_HORIZONTAL,

-           const wxValidator& validator = wxDefaultValidator, 
+           const wxValidator& validator = wxDefaultValidator,

            const wxString& name = wxSliderNameStr );
     virtual int GetValue() const;
     virtual void SetValue( int );
            const wxString& name = wxSliderNameStr );
     virtual int GetValue() const;
     virtual void SetValue( int );


@@ -79,15 +80,15 @@ public:
     int GetThumbLength() const;
     void SetTick( int tickPos );
 
     int GetThumbLength() const;
     void SetTick( int tickPos );
 

-    // implementation    
+    // implementation

     // --------------
     // --------------

-    
+

     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();

-    
+

     GtkAdjustment  *m_adjust;
     float           m_oldPos;
     GtkAdjustment  *m_adjust;
     float           m_oldPos;

-    
+

 private:
     DECLARE_DYNAMIC_CLASS(wxSlider)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxSlider)
 };