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

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

diff --git a/include/wx/mac/carbon/statbox.h b/include/wx/mac/carbon/statbox.h
index 9f73a539ed89a5b84ee0962a7c2a7b672474ecf2..7c1c2204cf2c0adcd3564bf03d8bf406f2c1c3b7 100644 (file)
--- a/include/wx/mac/carbon/statbox.h
+++ b/include/wx/mac/carbon/statbox.h
@@ -12,45 +12,40 @@
 #ifndef _WX_STATBOX_H_
 #define _WX_STATBOX_H_
 
 #ifndef _WX_STATBOX_H_
 #define _WX_STATBOX_H_
 

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

 #include "wx/control.h"
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr;
+WXDLLIMPEXP_DATA_CORE(extern const char) wxStaticBoxNameStr[];

 
 // Group box
 
 // Group box

-class WXDLLEXPORT wxStaticBox: public wxControl
+class WXDLLIMPEXP_CORE wxStaticBox: public wxControl

 {
   DECLARE_DYNAMIC_CLASS(wxStaticBox)
 
  public:
 {
   DECLARE_DYNAMIC_CLASS(wxStaticBox)
 
  public:

-  inline wxStaticBox() {}
-  inline wxStaticBox(wxWindow *parent, wxWindowID id,
+    inline wxStaticBox() {}
+    inline wxStaticBox(wxWindow *parent, wxWindowID id,

            const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = 0,
            const wxString& name = wxStaticBoxNameStr)
            const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = 0,
            const wxString& name = wxStaticBoxNameStr)

-  {
-    Create(parent, id, label, pos, size, style, name);
-  }
+    {
+        Create(parent, id, label, pos, size, style, name);
+    }

 
 

-  bool Create(wxWindow *parent, wxWindowID id,
+    bool Create(wxWindow *parent, wxWindowID id,

            const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = 0,
            const wxString& name = wxStaticBoxNameStr);
 
            const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            long style = 0,
            const wxString& name = wxStaticBoxNameStr);
 

-  virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
-  virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
-
-
-protected:
+    virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
+    virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};

 
 

-DECLARE_EVENT_TABLE()
+    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
+    
+    virtual bool AcceptsFocus() const { return false; }

 };
 
 #endif
 };
 
 #endif