added wxCRITICAL_SECTION macro

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

diff --git a/include/wx/gtk1/spinbutt.h b/include/wx/gtk1/spinbutt.h
index 378b7f0f94a052a45e06a130d5beb611e16df827..86f873ec174affffabcf98a864a4f152afc285e6 100644 (file)
--- a/include/wx/gtk1/spinbutt.h
+++ b/include/wx/gtk1/spinbutt.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        spinbutt.h
+// Name:        wx/gtk/spinbutt.h

 // Purpose:     wxSpinButton class
 // Author:      Robert Roebling
 // Modified by:
 // Purpose:     wxSpinButton class
 // Author:      Robert Roebling
 // Modified by:


@@ -8,8 +8,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKSPINBUTTH__
-#define __GTKSPINBUTTH__
+#ifndef _WX_GTK_SPINBUTT_H_
+#define _WX_GTK_SPINBUTT_H_

 
 #ifdef __GNUG__
 #pragma interface
 
 #ifdef __GNUG__
 #pragma interface


@@ -23,16 +23,22 @@ class wxSpinButton : public wxSpinButtonBase
 {
 public:
     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(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);
     }
 
     {
         Create(parent, id, pos, size, style, name);
     }
 

-    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 );
 
     virtual int GetValue() const;
     virtual void SetValue( int value );


@@ -49,10 +55,13 @@ public:
     GtkAdjustment  *m_adjust;
     float           m_oldPos;
 
     GtkAdjustment  *m_adjust;
     float           m_oldPos;
 

+protected:
+    virtual wxSize DoGetBestSize() const;
+

 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxSpinButton)
 };
 
 #endif
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxSpinButton)
 };
 
 #endif

-    // __GTKSPINBUTTH__
+    // _WX_GTK_SPINBUTT_H_