oops, removed duplicate SetIcons[s]() added in last commit

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

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index 02f5c7ef054a92e047132b6f72313e3f1253893a..e0e4566370a49248554c847975c496014cb55fee 100644 (file)
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -26,7 +26,7 @@
 class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxBitmap;
 
 class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxBitmap;
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBitmapNameStr;

 
 // a control showing an icon or a bitmap
 class WXDLLEXPORT wxStaticBitmapBase : public wxControl
 
 // a control showing an icon or a bitmap
 class WXDLLEXPORT wxStaticBitmapBase : public wxControl


@@ -34,17 +34,17 @@ class WXDLLEXPORT wxStaticBitmapBase : public wxControl
 public:
     wxStaticBitmapBase() { }
     virtual ~wxStaticBitmapBase();
 public:
     wxStaticBitmapBase() { }
     virtual ~wxStaticBitmapBase();

-    
+

     // our interface
     virtual void SetIcon(const wxIcon& icon) = 0;
     virtual void SetBitmap(const wxBitmap& bitmap) = 0;
     virtual wxBitmap GetBitmap() const = 0;
 
     // overriden base class virtuals
     // our interface
     virtual void SetIcon(const wxIcon& icon) = 0;
     virtual void SetBitmap(const wxBitmap& bitmap) = 0;
     virtual wxBitmap GetBitmap() const = 0;
 
     // overriden base class virtuals

-    virtual bool AcceptsFocus() const { return FALSE; }
+    virtual bool AcceptsFocus() const { return false; }

 
 protected:
 
 protected:

-    virtual wxSize DoGetBestClientSize() const;
+    virtual wxSize DoGetBestSize() const;

 
     DECLARE_NO_COPY_CLASS(wxStaticBitmapBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxStaticBitmapBase)
 };