wxTheColourDatabase->Find() can fail.

[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 6dd85bf43dc78c2527cb7521203eb4dbe13c2868..11fee4c9b41862bb9824cb44d11626810070f2ff 100644 (file)
--- a/include/wx/mac/carbon/statbox.h
+++ b/include/wx/mac/carbon/statbox.h
@@ -12,13 +12,9 @@
 #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;
+WXDLLEXPORT_DATA(extern const wxChar) wxStaticBoxNameStr[];

 
 // Group box
 class WXDLLEXPORT wxStaticBox: public wxControl
 
 // Group box
 class WXDLLEXPORT wxStaticBox: public wxControl


@@ -47,8 +43,7 @@ class WXDLLEXPORT wxStaticBox: public wxControl
     virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
     virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
 
     virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
     virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
 

-
-protected:
+    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;

 };
 
 #endif
 };
 
 #endif