More broken compilers with enum/wxString& ambiguity.

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

diff --git a/include/wx/msw/spinctrl.h b/include/wx/msw/spinctrl.h
index 61a03e25efe69a15db86cecc9a3f45d54619234e..677e2f181af84e589730abe64eab3e7b059d3589 100644 (file)
--- a/include/wx/msw/spinctrl.h
+++ b/include/wx/msw/spinctrl.h
@@ -12,15 +12,16 @@
 #ifndef _WX_MSW_SPINCTRL_H_
 #define _WX_MSW_SPINCTRL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "spinctrl.h"
 #endif
 
 #include "wx/spinbutt.h"    // the base class
 
 #include "wx/dynarray.h"
+
 class WXDLLEXPORT wxSpinCtrl;
-WX_DEFINE_EXPORTED_ARRAY(wxSpinCtrl *, wxArraySpins);
+WX_DEFINE_EXPORTED_ARRAY_PTR(wxSpinCtrl *, wxArraySpins);
 
 // ----------------------------------------------------------------------------
 // Under Win32, wxSpinCtrl is a wxSpinButton with a buddy (as MSDN docs call
@@ -58,6 +59,9 @@ public:
     // because the base class already has one returning int!)
     void SetValue(const wxString& text);
 
+    // another wxTextCtrl-like method
+    void SetSelection(long from, long to);
+
     // implementation only from now on
     // -------------------------------
 
@@ -94,6 +98,10 @@ protected:
     // the handler for wxSpinButton events
     void OnSpinChange(wxSpinEvent& event);
 
+    // Handle processing of special keys
+    void OnChar(wxKeyEvent& event);
+    void OnSetFocus(wxFocusEvent& event);
+
     // the data for the "buddy" text ctrl
     WXHWND     m_hwndBuddy;
     WXFARPROC  m_wndProcBuddy;
@@ -105,6 +113,7 @@ protected:
 private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxSpinCtrl)
 };
 
 #endif // _WX_MSW_SPINCTRL_H_