nested iterator classes must be dll-exported

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

diff --git a/include/wx/motif/spinbutt.h b/include/wx/motif/spinbutt.h
index 77aa1ec12d7d2edb2add1c6aaeade7e6a5290f7d..abe12fb2ee78163c677e17b352ab0f7953ef4371 100644 (file)
--- a/include/wx/motif/spinbutt.h
+++ b/include/wx/motif/spinbutt.h
@@ -12,16 +12,14 @@
 #ifndef _WX_SPINBUTT_H_
 #define _WX_SPINBUTT_H_
 
 #ifndef _WX_SPINBUTT_H_
 #define _WX_SPINBUTT_H_
 

-#ifdef __GNUG__
-#pragma interface "spinbutt.h"
-#endif
+class WXDLLEXPORT wxArrowButton; // internal

 
 class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase
 {
     DECLARE_DYNAMIC_CLASS(wxSpinButton)
         
 public:
 
 class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase
 {
     DECLARE_DYNAMIC_CLASS(wxSpinButton)
         
 public:

-    wxSpinButton() { }
+    wxSpinButton() : m_up( 0 ), m_down( 0 ), m_pos( 0 ) { }

     
     wxSpinButton(wxWindow *parent,
         wxWindowID id = -1,
     
     wxSpinButton(wxWindow *parent,
         wxWindowID id = -1,


@@ -29,6 +27,9 @@ public:
         const wxSize& size = wxDefaultSize,
         long style = wxSP_VERTICAL,
         const wxString& name = "wxSpinButton")
         const wxSize& size = wxDefaultSize,
         long style = wxSP_VERTICAL,
         const wxString& name = "wxSpinButton")

+        : m_up( 0 ),
+        m_down( 0 ),
+        m_pos( 0 )

     {
         Create(parent, id, pos, size, style, name);
     }
     {
         Create(parent, id, pos, size, style, name);
     }


@@ -51,14 +52,24 @@ public:
     void SetRange(int minVal, int maxVal);
     
     // Implementation
     void SetRange(int minVal, int maxVal);
     
     // Implementation

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

     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();

-    
-protected:
-    int   m_min;
-    int   m_max;
+public:
+    // implementation detail
+    void Increment( int delta );
+
+private:
+    virtual void DoSetSize(int x, int y, int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+    virtual void DoMoveWindow(int x, int y, int width, int height);
+    virtual wxSize DoGetBestSize() const;
+
+    wxArrowButton* m_up;
+    wxArrowButton* m_down;
+    int m_pos;

 };
 
 #endif
 };
 
 #endif