Don't use "Cancel" button in the about dialog of the listctrl sample.

[wxWidgets.git] / include / wx / osx / stattext.h

diff --git a/include/wx/osx/stattext.h b/include/wx/osx/stattext.h
index fc69ab3457c57a5e43eaa57ce8f7bb95caa5ede2..d83a51d874fc6b3a17917d5ad24032cfc40d03f3 100644 (file)
--- a/include/wx/osx/stattext.h
+++ b/include/wx/osx/stattext.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        stattext.h
+// Name:        wx/osx/stattext.h
 // Purpose:     wxStaticText class
 // Author:      Stefan Csomor
 // Modified by:
@@ -38,7 +38,7 @@ public:
   void SetLabel( const wxString &str ) ;
   bool SetFont( const wxFont &font );
 
-    virtual bool AcceptsFocus() const { return FALSE; }
+    virtual bool AcceptsFocus() const { return false; }
 
 protected :
 
@@ -47,6 +47,10 @@ protected :
 
   virtual wxSize DoGetBestSize() const ;
 
+#if wxUSE_MARKUP && wxOSX_USE_COCOA
+    virtual bool DoSetLabelMarkup(const wxString& markup);
+#endif // wxUSE_MARKUP && wxOSX_USE_COCOA
+
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)
 };