carbon cfm fixes

[wxWidgets.git] / include / wx / gtk / statline.h

diff --git a/include/wx/gtk/statline.h b/include/wx/gtk/statline.h
index e29e20d5d06f4269794f386a4a633f24f82a28fa..803ae2018acb3f06ab5b3c697c629e97a5541396 100644 (file)
--- a/include/wx/gtk/statline.h
+++ b/include/wx/gtk/statline.h
@@ -11,13 +11,13 @@
 #ifndef __GTKSTATICLINEH__
 #define __GTKSTATICLINEH__
 
 #ifndef __GTKSTATICLINEH__
 #define __GTKSTATICLINEH__
 

-#ifdef __GNUG__
-    #pragma interface
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface

 #endif
 
 #endif
 

-#if !wxUSE_STATLINE
-    #error "This file should only be included if wxUSE_STATLINE == 1"
-#endif
+#include "wx/defs.h"
+
+#if wxUSE_STATLINE

 
 #include "wx/object.h"
 #include "wx/list.h"
 
 #include "wx/object.h"
 #include "wx/list.h"


@@ -45,6 +45,14 @@ public:
     bool Create(  wxWindow *parent, wxWindowID id,
             const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
             long style = wxLI_HORIZONTAL, const wxString &name = wxStaticTextNameStr );
     bool Create(  wxWindow *parent, wxWindowID id,
             const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
             long style = wxLI_HORIZONTAL, const wxString &name = wxStaticTextNameStr );

+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+    

 };
 
 };
 

-#endif // __GTKSTATICLINEH__
+#endif 
+  // wxUSE_STATLINE
+  
+#endif 
+  // __GTKSTATICLINEH__