Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/gtk/spinbutt.h b/include/wx/gtk/spinbutt.h
index 86f873ec174affffabcf98a864a4f152afc285e6..4a9d20461e81826627163f879b8fc9caacbac50c 100644 (file)
--- a/include/wx/gtk/spinbutt.h
+++ b/include/wx/gtk/spinbutt.h
@@ -3,7 +3,6 @@
 // Purpose:     wxSpinButton class
 // Author:      Robert Roebling
 // Modified by:
 // Purpose:     wxSpinButton class
 // Author:      Robert Roebling
 // Modified by:

-// RCS-ID:      $Id$

 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -11,18 +10,14 @@
 #ifndef _WX_GTK_SPINBUTT_H_
 #define _WX_GTK_SPINBUTT_H_
 
 #ifndef _WX_GTK_SPINBUTT_H_
 #define _WX_GTK_SPINBUTT_H_
 

-#ifdef __GNUG__
-#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,19 +41,26 @@ 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:
 
 private:

+    typedef wxSpinButtonBase base_type;
+

     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxSpinButton)
 };
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxSpinButton)
 };