more fixes, printing works quite fine now

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

diff --git a/include/wx/gtk1/slider.h b/include/wx/gtk1/slider.h
index dda48b2093b09218bdf68c39d55cefdd73cea350..f6839196420d722080bc7e373d241146a0a2dd99 100644 (file)
--- a/include/wx/gtk1/slider.h
+++ b/include/wx/gtk1/slider.h
@@ -43,21 +43,24 @@ class wxSlider: public wxControl
 
   public:
     wxSlider(void);
 
   public:
     wxSlider(void);

-    wxSlider( wxWindow *parent, wxWindowID id,
+    inline wxSlider( wxWindow *parent, wxWindowID id,

            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSL_HORIZONTAL,
            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSL_HORIZONTAL,

-/*           const wxValidator& validator = wxDefaultValidator, */
-           const wxString& name = wxSliderNameStr);
-   ~wxSlider(void);
-   bool Create(wxWindow *parent, wxWindowID id,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxSliderNameStr )
+    {
+      Create( parent, id, value, minValue, maxValue, pos, size, style, validator, name );
+    }
+    ~wxSlider(void);
+    bool Create(wxWindow *parent, wxWindowID id,

            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSL_HORIZONTAL,
            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = wxSL_HORIZONTAL,

-/*           const wxValidator& validator = wxDefaultValidator, */
-           const wxString& name = wxSliderNameStr);
+           const wxValidator& validator = wxDefaultValidator, 
+           const wxString& name = wxSliderNameStr );

     virtual int GetValue(void) const;
     virtual void SetValue( int );
     void GetSize( int *x, int *y ) const;
     virtual int GetValue(void) const;
     virtual void SetValue( int );
     void GetSize( int *x, int *y ) const;


@@ -81,8 +84,10 @@ class wxSlider: public wxControl
     int GetThumbLength(void) const;
     void SetTick( int tickPos );
 
     int GetThumbLength(void) const;
     void SetTick( int tickPos );
 

-  public:
-  
+  // implementation    
+    
+    bool IsOwnGtkWindow( GdkWindow *window );
+    

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