Remove SetPageTitle and GetPageTitle and make GetCurrentTitle actually return the...

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

diff --git a/include/wx/gtk1/spinctrl.h b/include/wx/gtk1/spinctrl.h
index e8721664cacd0e977efa2c41ba7e59beec49b33c..e748a60ac9162b980dfc86dbe7eaaab0ef36efee 100644 (file)
--- a/include/wx/gtk1/spinctrl.h
+++ b/include/wx/gtk1/spinctrl.h
@@ -1,20 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        spinctrl.h
+// Name:        wx/gtk1/spinctrl.h

 // Purpose:     wxSpinCtrl class
 // Author:      Robert Roebling
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Purpose:     wxSpinCtrl class
 // Author:      Robert Roebling
 // Modified by:
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKSPINCTRLH__
 #define __GTKSPINCTRLH__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKSPINCTRLH__
 #define __GTKSPINCTRLH__
 

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

 #include "wx/defs.h"
 
 #if wxUSE_SPINCTRL
 #include "wx/defs.h"
 
 #if wxUSE_SPINCTRL


@@ -25,7 +21,7 @@
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 

-class wxSpinCtrl : public wxControl
+class WXDLLIMPEXP_CORE wxSpinCtrl : public wxControl

 {
 public:
     wxSpinCtrl() {}
 {
 public:
     wxSpinCtrl() {}


@@ -36,7 +32,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = wxSP_ARROW_KEYS,
                int min = 0, int max = 100, int initial = 0,
                const wxSize& size = wxDefaultSize,
                long style = wxSP_ARROW_KEYS,
                int min = 0, int max = 100, int initial = 0,

-               const wxString& name = _T("wxSpinCtrl"))
+               const wxString& name = wxT("wxSpinCtrl"))

     {
         Create(parent, id, value, pos, size, style, min, max, initial, name);
     }
     {
         Create(parent, id, value, pos, size, style, min, max, initial, name);
     }


@@ -48,7 +44,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxSP_ARROW_KEYS,
                 int min = 0, int max = 100, int initial = 0,
                 const wxSize& size = wxDefaultSize,
                 long style = wxSP_ARROW_KEYS,
                 int min = 0, int max = 100, int initial = 0,

-                const wxString& name = _T("wxSpinCtrl"));
+                const wxString& name = wxT("wxSpinCtrl"));

 
     void SetValue(const wxString& text);
     void SetSelection(long from, long to);
 
     void SetValue(const wxString& text);
     void SetSelection(long from, long to);


@@ -61,12 +57,11 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

-    
+

     // implementation
     void OnChar( wxKeyEvent &event );
     // implementation
     void OnChar( wxKeyEvent &event );

-    
+

     bool IsOwnGtkWindow( GdkWindow *window );
     bool IsOwnGtkWindow( GdkWindow *window );

-    void ApplyWidgetStyle();

     void GtkDisableEvents();
     void GtkEnableEvents();
 
     void GtkDisableEvents();
     void GtkEnableEvents();