avoid a bug in Carbon headers

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

diff --git a/include/wx/univ/spinbutt.h b/include/wx/univ/spinbutt.h
index 07b66be03d3dcb3696115c8640742c4f8ba007c5..6f2ec38af0507dd373e2d85c02bc2ff77b9bfed7 100644 (file)
--- a/include/wx/univ/spinbutt.h
+++ b/include/wx/univ/spinbutt.h
@@ -12,8 +12,8 @@
 #ifndef _WX_UNIV_SPINBUTT_H_
 #define _WX_UNIV_SPINBUTT_H_
 
 #ifndef _WX_UNIV_SPINBUTT_H_
 #define _WX_UNIV_SPINBUTT_H_
 

-#ifdef __GNUG__
-    #pragma interface "spinbutt.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "univspinbutt.h"

 #endif
 
 #include "wx/univ/scrarrow.h"
 #endif
 
 #include "wx/univ/scrarrow.h"


@@ -107,12 +107,12 @@ class WXDLLEXPORT wxStdSpinButtonInputHandler : public wxStdInputHandler
 public:
     wxStdSpinButtonInputHandler(wxInputHandler *inphand);
 
 public:
     wxStdSpinButtonInputHandler(wxInputHandler *inphand);
 

-    virtual bool HandleKey(wxControl *control,
+    virtual bool HandleKey(wxInputConsumer *consumer,

                            const wxKeyEvent& event,
                            bool pressed);
                            const wxKeyEvent& event,
                            bool pressed);

-    virtual bool HandleMouse(wxControl *control,
+    virtual bool HandleMouse(wxInputConsumer *consumer,

                              const wxMouseEvent& event);
                              const wxMouseEvent& event);

-    virtual bool HandleMouseMove(wxControl *control,
+    virtual bool HandleMouseMove(wxInputConsumer *consumer,

                                  const wxMouseEvent& event);
 };
 
                                  const wxMouseEvent& event);
 };