check for wxUSE_MDI which is needed by this code (patch 1656080)

[wxWidgets.git] / contrib / include / wx / gizmos / statpict.h

diff --git a/contrib/include/wx/gizmos/statpict.h b/contrib/include/wx/gizmos/statpict.h
index d488a99201074aa0e3f26801a0c8be73f5fe22b3..fd8633dbe6262f18a001c5646624fcd8ecfe70ab 100644 (file)
--- a/contrib/include/wx/gizmos/statpict.h
+++ b/contrib/include/wx/gizmos/statpict.h
@@ -12,16 +12,14 @@
 #ifndef _WX_STATPICT_H_
 #define _WX_STATPICT_H_
 
 #ifndef _WX_STATPICT_H_
 #define _WX_STATPICT_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "statpict.h"
-#endif
-

 #include "wx/control.h"
 
 #include "wx/icon.h"
 #include "wx/bitmap.h"
 #include "wx/image.h"
 
 #include "wx/control.h"
 
 #include "wx/icon.h"
 #include "wx/bitmap.h"
 #include "wx/image.h"
 

+#include "wx/gizmos/gizmos.h"
+

 enum
 {
     wxSCALE_HORIZONTAL = 0x1,
 enum
 {
     wxSCALE_HORIZONTAL = 0x1,


@@ -30,10 +28,9 @@ enum
     wxSCALE_CUSTOM     = 0x8
 };
 
     wxSCALE_CUSTOM     = 0x8
 };
 

-//WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
-extern const wxChar* wxStaticPictureNameStr;
+WXDLLIMPEXP_GIZMOS extern const wxChar* wxStaticPictureNameStr;

 
 

-class /*WXDLLEXPORT*/ wxStaticPicture : public wxControl
+class WXDLLIMPEXP_GIZMOS wxStaticPicture : public wxControl

 {
     DECLARE_DYNAMIC_CLASS(wxStaticPicture)
 
 {
     DECLARE_DYNAMIC_CLASS(wxStaticPicture)