Cast for argument to delete[] - VC6 doesn't want to delete a const pointer

[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 c5f41c02c41b6e220eabcc3cb61f0ec47538b266..fc69ab3457c57a5e43eaa57ce8f7bb95caa5ede2 100644 (file)
--- a/include/wx/mac/carbon/stattext.h
+++ b/include/wx/mac/carbon/stattext.h
@@ -12,11 +12,7 @@
 #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
+class WXDLLIMPEXP_CORE wxStaticText: public wxStaticTextBase

 {
 public:
     wxStaticText() { }
 {
 public:
     wxStaticText() { }


@@ -42,10 +38,14 @@ public:
   void SetLabel( const wxString &str ) ;
   bool SetFont( const wxFont &font );
 
   void SetLabel( const wxString &str ) ;
   bool SetFont( const wxFont &font );
 

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

 protected :
 
 protected :
 

+    virtual wxString DoGetLabel() const;
+    virtual void DoSetLabel(const wxString& str);
+

   virtual wxSize DoGetBestSize() const ;
   virtual wxSize DoGetBestSize() const ;

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

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