make OSX defines to be 1, not only defined, for backwards compatibility reasons

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

diff --git a/include/wx/gtk/spinbutt.h b/include/wx/gtk/spinbutt.h
index 0969b157d34b2238401a2437bdc472a57127c89c..5449e2add7f647249710734f249c0c423e636968 100644 (file)
--- a/include/wx/gtk/spinbutt.h
+++ b/include/wx/gtk/spinbutt.h
@@ -11,18 +11,14 @@
 #ifndef _WX_GTK_SPINBUTT_H_
 #define _WX_GTK_SPINBUTT_H_
 
 #ifndef _WX_GTK_SPINBUTT_H_
 #define _WX_GTK_SPINBUTT_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface
-#endif
-

 //-----------------------------------------------------------------------------
 // wxSpinButton
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxSpinButton
 //-----------------------------------------------------------------------------
 

-class wxSpinButton : public wxSpinButtonBase
+class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase

 {
 public:
 {
 public:

-    wxSpinButton() { }
+    wxSpinButton();

     wxSpinButton(wxWindow *parent,
                  wxWindowID id = -1,
                  const wxPoint& pos = wxDefaultPosition,
     wxSpinButton(wxWindow *parent,
                  wxWindowID id = -1,
                  const wxPoint& pos = wxDefaultPosition,


@@ -46,17 +42,22 @@ public:
     virtual int GetMin() const;
     virtual int GetMax() const;
 
     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 );
 
     // implementation
     void OnSize( wxSizeEvent &event );
 

-    bool IsOwnGtkWindow( GdkWindow *window );
-    void ApplyWidgetStyle();
-
-    GtkAdjustment  *m_adjust;
-    float           m_oldPos;
+    int m_pos;

 
 protected:
 
 protected:

+    void GtkDisableEvents() const;
+    void GtkEnableEvents() const;
+    

     virtual wxSize DoGetBestSize() const;
     virtual wxSize DoGetBestSize() const;

+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;

 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()