Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/gtk1/statbmp.h b/include/wx/gtk1/statbmp.h
index d11396a14a1614e586e5976d363dada45a3687a4..0e7243052258f086365045fa49ffc1d486dd2d0b 100644 (file)
--- a/include/wx/gtk1/statbmp.h
+++ b/include/wx/gtk1/statbmp.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/gtk/statbmp.h
+// Name:        wx/gtk1/statbmp.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,21 +7,16 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKSTATICBITMAPH__
 #define __GTKSTATICBITMAPH__
 
 #ifndef __GTKSTATICBITMAPH__
 #define __GTKSTATICBITMAPH__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface
-#endif
-

 #include "wx/icon.h"
 
 //-----------------------------------------------------------------------------
 // wxStaticBitmap
 //-----------------------------------------------------------------------------
 
 #include "wx/icon.h"
 
 //-----------------------------------------------------------------------------
 // wxStaticBitmap
 //-----------------------------------------------------------------------------
 

-class wxStaticBitmap : public wxStaticBitmapBase
+class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase

 {
 public:
     wxStaticBitmap();
 {
 public:
     wxStaticBitmap();


@@ -52,10 +47,10 @@ public:
         return (const wxIcon &)m_bitmap;
     }
 
         return (const wxIcon &)m_bitmap;
     }
 

-private:
-    // creates the new pixmap widget
-    void CreatePixmapWidget();
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

 
 

+private:

     wxBitmap   m_bitmap;
 
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
     wxBitmap   m_bitmap;
 
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)