use explicit virtual keyword with overridden virtual methods

[wxWidgets.git] / include / wx / mac / carbon / stattext.h

diff --git a/include/wx/mac/carbon/stattext.h b/include/wx/mac/carbon/stattext.h
index 95c32a82b9c905f252f475d3923278e1a3140024..042d0d3f5905e2f279e831876069170d566a49d4 100644 (file)
--- a/include/wx/mac/carbon/stattext.h
+++ b/include/wx/mac/carbon/stattext.h
@@ -12,10 +12,6 @@
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "stattext.h"
-#endif
-

 class WXDLLEXPORT wxStaticText: public wxStaticTextBase
 {
 public:
 class WXDLLEXPORT wxStaticText: public wxStaticTextBase
 {
 public:


@@ -40,11 +36,13 @@ public:
 
   // accessors
   void SetLabel( const wxString &str ) ;
 
   // accessors
   void SetLabel( const wxString &str ) ;

+  bool SetFont( const wxFont &font );
+
+    virtual bool AcceptsFocus() const { return FALSE; }

 
 protected :
 
   virtual wxSize DoGetBestSize() const ;
 
 protected :
 
   virtual wxSize DoGetBestSize() const ;

-  virtual bool AcceptsFocus() const { return FALSE; }

 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)
 };