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 c1119e7dfb1b205d9bfbb4d642a44ef4cb1a1f5d..fc69ab3457c57a5e43eaa57ce8f7bb95caa5ede2 100644 (file)
--- a/include/wx/mac/carbon/stattext.h
+++ b/include/wx/mac/carbon/stattext.h
@@ -6,17 +6,13 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #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() { }
@@ -42,10 +38,14 @@ public:
   void SetLabel( const wxString &str ) ;
   bool SetFont( const wxFont &font );
 
+    virtual bool AcceptsFocus() const { return FALSE; }
+
 protected :
 
+    virtual wxString DoGetLabel() const;
+    virtual void DoSetLabel(const wxString& str);
+
   virtual wxSize DoGetBestSize() const ;
-  virtual bool AcceptsFocus() const { return FALSE; }
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)
 };