fixed warnings after GetFont prototype change

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

diff --git a/include/wx/univ/button.h b/include/wx/univ/button.h
index c6710499de6e653ede466511300eecb7fa43b250..e6bb4f0355ac582c581c476a5f52da9921838732 100644 (file)
--- a/include/wx/univ/button.h
+++ b/include/wx/univ/button.h
@@ -6,14 +6,14 @@
 // Created:     15.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     15.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_BUTTON_H_
 #define _WX_UNIV_BUTTON_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_BUTTON_H_
 #define _WX_UNIV_BUTTON_H_
 

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

 #endif
 
 class WXDLLEXPORT wxInputHandler;
 #endif
 
 class WXDLLEXPORT wxInputHandler;


@@ -109,6 +109,8 @@ protected:
                                long numArg = -1,
                                const wxString& strArg = wxEmptyString);
     virtual wxSize DoGetBestClientSize() const;
                                long numArg = -1,
                                const wxString& strArg = wxEmptyString);
     virtual wxSize DoGetBestClientSize() const;

+    
+    virtual bool DoDrawBackground(wxDC& dc);

     virtual void DoDraw(wxControlRenderer *renderer);
 
     virtual bool CanBeHighlighted() const { return TRUE; }
     virtual void DoDraw(wxControlRenderer *renderer);
 
     virtual bool CanBeHighlighted() const { return TRUE; }


@@ -139,14 +141,14 @@ class WXDLLEXPORT wxStdButtonInputHandler : public wxStdInputHandler
 public:
     wxStdButtonInputHandler(wxInputHandler *inphand);
 
 public:
     wxStdButtonInputHandler(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, const wxMouseEvent& event);
-    virtual bool HandleFocus(wxControl *control, const wxFocusEvent& event);
-    virtual bool HandleActivation(wxControl *control, bool activated);
+    virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event);
+    virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event);
+    virtual bool HandleActivation(wxInputConsumer *consumer, bool activated);

 
 private:
     // the window (button) which has capture or NULL and the flag telling if
 
 private:
     // the window (button) which has capture or NULL and the flag telling if