Add wxBitmap::NewFromPNGData() for creating bitmaps from PNG data.

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

diff --git a/include/wx/gtk1/statline.h b/include/wx/gtk1/statline.h
index c6819e51a50c27ea2c89e80cbde3a6d912cf3ae0..36609247f0bb4d986dc9a3ff7fd7b709779443cd 100644 (file)
--- a/include/wx/gtk1/statline.h
+++ b/include/wx/gtk1/statline.h
@@ -1,55 +1,49 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statline.h
+// Name:        wx/gtk1/statline.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKSTATICLINEH__
 #define __GTKSTATICLINEH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxStaticLine;
 
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
+#if wxUSE_STATLINE
 
-extern const char *wxStaticTextNameStr;
-
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // wxStaticLine
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
-class wxStaticLine: public wxControl
+class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase
 {
-  DECLARE_DYNAMIC_CLASS(wxStaticLine)
-
-  public:
-
-    wxStaticLine(void);
-    wxStaticLine( 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 );
-    
+public:
+    wxStaticLine();
+    wxStaticLine(wxWindow *parent,
+                 wxWindowID id = wxID_ANY,
+                 const wxPoint &pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxLI_HORIZONTAL,
+                 const wxString &name = wxStaticLineNameStr);
+    bool Create(wxWindow *parent,
+                wxWindowID id = wxID_ANY,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxLI_HORIZONTAL,
+                const wxString &name = wxStaticLineNameStr);
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxStaticLine)
 };
 
+#endif // wxUSE_STATLINE
+
 #endif // __GTKSTATICLINEH__
+