compilation fix for cygwin

[wxWidgets.git] / include / wx / gtk1 / statbox.h

diff --git a/include/wx/gtk1/statbox.h b/include/wx/gtk1/statbox.h
index d6c8314bc0decd67faf62afe4727005678156529..c6e232c525d8c07345357754eeb61570827a80cc 100644 (file)
--- a/include/wx/gtk1/statbox.h
+++ b/include/wx/gtk1/statbox.h
@@ -1,56 +1,53 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        stabox.h
+// Name:        wx/gtk/stabox.h

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKSTATICBOXH__
 #define __GTKSTATICBOXH__
 
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKSTATICBOXH__
 #define __GTKSTATICBOXH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxStaticBox;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxStaticBoxNameStr;
-

 //-----------------------------------------------------------------------------
 // wxStaticBox
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxStaticBox
 //-----------------------------------------------------------------------------
 

-class wxStaticBox: public wxControl
+class wxStaticBox : public wxStaticBoxBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxStaticBox)
-
-  public:
-
-    wxStaticBox(void);
-    wxStaticBox( wxWindow *parent, wxWindowID id, const wxString &label, 
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      long style = 0, const wxString &name = wxStaticBoxNameStr  );
-    bool Create( wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      long style = 0, const wxString &name = wxStaticBoxNameStr  );
-    void SetLabel( const wxString &label );
+public:
+    wxStaticBox();
+    wxStaticBox( wxWindow *parent,
+                 wxWindowID id,
+                 const wxString &label,
+                 const wxPoint &pos = wxDefaultPosition,
+                 const wxSize &size = wxDefaultSize,
+                 long style = 0,
+                 const wxString &name = wxStaticBoxNameStr );
+    bool Create( wxWindow *parent,
+                 wxWindowID id,
+                 const wxString &label,
+                 const wxPoint &pos = wxDefaultPosition,
+                 const wxSize &size = wxDefaultSize,
+                 long style = 0,
+                 const wxString &name = wxStaticBoxNameStr );
+
+    virtual void SetLabel( const wxString &label );
+
+    // implementation
+
+    virtual void ApplyWidgetStyle();
+
+    virtual bool IsTransparentForMouse() const { return TRUE; }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxStaticBox)

 };
 
 #endif // __GTKSTATICBOXH__
 };
 
 #endif // __GTKSTATICBOXH__