no changes, just remove #if'd out code

[wxWidgets.git] / include / wx / gtk / spinbutt.h

diff --git a/include/wx/gtk/spinbutt.h b/include/wx/gtk/spinbutt.h
index 440c26afe73dc7bf6dc2cb233e7c3b4953325d65..5449e2add7f647249710734f249c0c423e636968 100644 (file)
--- a/include/wx/gtk/spinbutt.h
+++ b/include/wx/gtk/spinbutt.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        spinbutt.h
+// Name:        wx/gtk/spinbutt.h
 // Purpose:     wxSpinButton class
 // Author:      Robert Roebling
 // Modified by:
@@ -8,34 +8,33 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKSPINPUTTH__
-#define __GTKSPINBUTTH__
-
-#ifdef __GNUG__
-#pragma interface
-#endif
+#ifndef _WX_GTK_SPINBUTT_H_
+#define _WX_GTK_SPINBUTT_H_
 
 //-----------------------------------------------------------------------------
 // wxSpinButton
 //-----------------------------------------------------------------------------
 
-class wxSpinButton : public wxSpinButtonBase
+class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase
 {
-    DECLARE_DYNAMIC_CLASS(wxSpinButton)
-
 public:
-    wxSpinButton() { }
-    wxSpinButton( wxWindow *parent, wxWindowID id = -1,
-            const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            long style = wxSP_VERTICAL, const wxString& name = "wxSpinButton")
+    wxSpinButton();
+    wxSpinButton(wxWindow *parent,
+                 wxWindowID id = -1,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxSP_VERTICAL,
+                 const wxString& name = wxSPIN_BUTTON_NAME)
     {
         Create(parent, id, pos, size, style, name);
     }
-    ~wxSpinButton();
 
-    bool Create( wxWindow *parent, wxWindowID id = -1,
-            const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            long style = wxSP_VERTICAL, const wxString& name = "wxSpinButton" );
+    bool Create(wxWindow *parent,
+                wxWindowID id = -1,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxSP_VERTICAL,
+                const wxString& name = wxSPIN_BUTTON_NAME);
 
     virtual int GetValue() const;
     virtual void SetValue( int value );
@@ -43,18 +42,27 @@ public:
     virtual int GetMin() const;
     virtual int GetMax() const;
 
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+    
+    virtual bool Enable( bool enable = true );
+
     // implementation
     void OnSize( wxSizeEvent &event );
 
-    bool IsOwnGtkWindow( GdkWindow *window );
-    void ApplyWidgetStyle();
+    int m_pos;
 
-    GtkAdjustment  *m_adjust;
-    float           m_oldPos;
+protected:
+    void GtkDisableEvents() const;
+    void GtkEnableEvents() const;
+    
+    virtual wxSize DoGetBestSize() const;
+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
 private:
     DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxSpinButton)
 };
 
 #endif
-    // __GTKSPINBUTTH__
+    // _WX_GTK_SPINBUTT_H_