add comparison operators for wxPen/BrushStyle and wxSOLID/... constants to avoid...

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

diff --git a/include/wx/univ/statbmp.h b/include/wx/univ/statbmp.h
index fcfdf802ae0eb3c03993b1025236d3688e1951a4..a51a0f75a1d8a4c7ea4b9db992f7b55dc1ec708f 100644 (file)
--- a/include/wx/univ/statbmp.h
+++ b/include/wx/univ/statbmp.h
@@ -12,17 +12,13 @@
 #ifndef _WX_UNIV_STATBMP_H_
 #define _WX_UNIV_STATBMP_H_
 
 #ifndef _WX_UNIV_STATBMP_H_
 #define _WX_UNIV_STATBMP_H_
 

-#ifdef __GNUG__
-    #pragma interface "univstatbmp.h"
-#endif
-

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

-class wxStaticBitmap : public wxStaticBitmapBase
+class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase

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


@@ -35,7 +31,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0)
     {
                    const wxSize& size = wxDefaultSize,
                    long style = 0)
     {

-        Create(parent, -1, label, pos, size, style);
+        Create(parent, wxID_ANY, label, pos, size, style);

     }
 
     wxStaticBitmap(wxWindow *parent,
     }
 
     wxStaticBitmap(wxWindow *parent,


@@ -63,11 +59,12 @@ public:
 
     wxIcon GetIcon() const;
 
 
     wxIcon GetIcon() const;
 

-    virtual bool HasTransparentBackground() { return TRUE; }
-    
-private:
+    virtual bool HasTransparentBackground() { return true; }
+
+protected:

     virtual void DoDraw(wxControlRenderer *renderer);
 
     virtual void DoDraw(wxControlRenderer *renderer);
 

+private:

     // the bitmap which we show
     wxBitmap m_bitmap;
 
     // the bitmap which we show
     wxBitmap m_bitmap;