Patch from Hartwig and me for implementing reorderable dataview columns. Works on...

[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 f916e09f62fa00d6815aea4211302ee698838044..92b781ee5bc05cee0846dc1374a1c9ce372e7087 100644 (file)
--- a/include/wx/mac/carbon/statbox.h
+++ b/include/wx/mac/carbon/statbox.h
@@ -6,19 +6,15 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBOX_H_
 #define _WX_STATBOX_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "statbox.h"
-#endif
-
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr;
+WXDLLEXPORT_DATA(extern const char) wxStaticBoxNameStr[];
 
 // Group box
 class WXDLLEXPORT wxStaticBox: public wxControl
@@ -47,8 +43,9 @@ class WXDLLEXPORT wxStaticBox: public wxControl
     virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
     virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
 
-
-protected:
+    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
+    
+    virtual bool AcceptsFocus() const { return false; }
 };
 
 #endif