Richtext interface fixes and additions for Phoenix

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

diff --git a/include/wx/motif/spinbutt.h b/include/wx/motif/spinbutt.h
index 227cd698aa83320ef3d6c4aff0e20e8c841ed060..4e53cb891b95b1e727723d3b9a7922c78a6d5971 100644 (file)
--- a/include/wx/motif/spinbutt.h
+++ b/include/wx/motif/spinbutt.h
@@ -1,32 +1,28 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxSpinButton class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxSpinButton class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SPINBUTT_H_
 #define _WX_SPINBUTT_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SPINBUTT_H_
 #define _WX_SPINBUTT_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "spinbutt.h"
-#endif
-
-class WXDLLEXPORT wxArrowButton; // internal
+class WXDLLIMPEXP_FWD_CORE wxArrowButton; // internal

 
 

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

 {
     DECLARE_DYNAMIC_CLASS(wxSpinButton)
 {
     DECLARE_DYNAMIC_CLASS(wxSpinButton)

-        
+

 public:
     wxSpinButton() : m_up( 0 ), m_down( 0 ), m_pos( 0 ) { }
 public:
     wxSpinButton() : m_up( 0 ), m_down( 0 ), m_pos( 0 ) { }

-    
+

     wxSpinButton(wxWindow *parent,
     wxSpinButton(wxWindow *parent,

-        wxWindowID id = -1,
+        wxWindowID id = wxID_ANY,

         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxSP_VERTICAL,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxSP_VERTICAL,


@@ -37,28 +33,28 @@ public:
     {
         Create(parent, id, pos, size, style, name);
     }
     {
         Create(parent, id, pos, size, style, name);
     }

-    ~wxSpinButton();
-    
+    virtual ~wxSpinButton();
+

     bool Create(wxWindow *parent,
     bool Create(wxWindow *parent,

-        wxWindowID id = -1,
+        wxWindowID id = wxID_ANY,

         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxSP_VERTICAL,
         const wxString& name = "wxSpinButton");
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxSP_VERTICAL,
         const wxString& name = "wxSpinButton");

-       
+

     // accessors
     int GetValue() const;
     int GetMin() const { return m_min; }
     int GetMax() const { return m_max; }
     // accessors
     int GetValue() const;
     int GetMin() const { return m_min; }
     int GetMax() const { return m_max; }

-    
+

     // operations
     void SetValue(int val);
     void SetRange(int minVal, int maxVal);
     // operations
     void SetValue(int val);
     void SetRange(int minVal, int maxVal);

-    
+

     // Implementation
     virtual void Command(wxCommandEvent& event)
     // Implementation
     virtual void Command(wxCommandEvent& event)

-        { (void)ProcessCommand(event); };
-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
+        { (void)ProcessCommand(event); }
+    virtual void ChangeFont(bool keepOriginalSize = true);

     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
 public:
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
 public: