Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index ba61d269efb904e74a70fc288780f774bc608b7c..165ddb5af1d50719ac3055efbd491dda8fbafc0d 100644 (file)
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -16,10 +15,10 @@
 #include "wx/icon.h"
 #include "wx/bitmap.h"
 
 #include "wx/icon.h"
 #include "wx/bitmap.h"
 

-extern WXDLLEXPORT_DATA(const char) wxStaticBitmapNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBitmapNameStr[];

 
 // a control showing an icon or a bitmap
 
 // a control showing an icon or a bitmap

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

 {
 public:
     wxStaticBitmap() { Init(); }
 {
 public:
     wxStaticBitmap() { Init(); }


@@ -58,7 +57,7 @@ public:
     virtual bool CanApplyThemeBorder() const { return false; }
 
 protected:
     virtual bool CanApplyThemeBorder() const { return false; }
 
 protected:

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

 
     // ctor/dtor helpers
     void Init() { m_isIcon = true; m_image = NULL; m_currentHandle = 0; }
 
     // ctor/dtor helpers
     void Init() { m_isIcon = true; m_image = NULL; m_currentHandle = 0; }


@@ -70,6 +69,14 @@ protected:
     void SetImage(const wxGDIImage* image);
     void SetImageNoCopy( wxGDIImage* image );
 
     void SetImage(const wxGDIImage* image);
     void SetImageNoCopy( wxGDIImage* image );
 

+#ifndef __WXWINCE__
+    // draw the bitmap ourselves here if the OS can't do it correctly (if it
+    // can we leave it to it)
+    void DoPaintManually(wxPaintEvent& event);
+#endif // !__WXWINCE__
+
+    void WXHandleSize(wxSizeEvent& event);
+

     // we can have either an icon or a bitmap
     bool m_isIcon;
     wxGDIImage *m_image;
     // we can have either an icon or a bitmap
     bool m_isIcon;
     wxGDIImage *m_image;


@@ -79,7 +86,8 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)

-    DECLARE_NO_COPY_CLASS(wxStaticBitmap)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_NO_COPY_CLASS(wxStaticBitmap);

 };
 
 #endif
 };
 
 #endif