Replaced embedded images

[wxWidgets.git] / contrib / src / gizmos / statpict.cpp

diff --git a/contrib/src/gizmos/statpict.cpp b/contrib/src/gizmos/statpict.cpp
index 1886d3c54e93508a1f51eb0e370da559a6517b1a..62a51d123b3e2aeba4bd2684878ee43907c475c9 100644 (file)
--- a/contrib/src/gizmos/statpict.cpp
+++ b/contrib/src/gizmos/statpict.cpp
@@ -19,10 +19,9 @@
 #include "wx/gizmos/statpict.h"
 #include "wx/dcclient.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticPicture, wxControl)
-#endif
-
+WXDLLIMPEXP_GIZMOS const wxChar * wxStaticPictureNameStr = wxT("staticPicture");
+    
 /*
  * wxStaticPicture
  */
@@ -43,9 +42,9 @@ bool wxStaticPicture::Create(wxWindow *parent, wxWindowID id,
     wxSize size = s ;
     if ( bitmap.Ok() )
     {
-        if ( size.x == -1 )
+        if ( size.x == wxDefaultCoord )
             size.x = bitmap.GetWidth() ;
-        if ( size.y == -1 )
+        if ( size.y == wxDefaultCoord )
             size.y = bitmap.GetHeight() ;
     }
 
@@ -63,7 +62,7 @@ bool wxStaticPicture::Create(wxWindow *parent, wxWindowID id,
         OriginalImage = Bitmap.ConvertToImage();
 #endif
 
-    if ( id == -1 )
+    if ( id == wxID_ANY )
         m_windowId = (int)NewControlId();
     else
         m_windowId = id;
@@ -154,5 +153,3 @@ void wxStaticPicture::OnPaint(wxPaintEvent& WXUNUSED(event))
     dc.EndDrawing();
 }
 
-//WXDLLEXPORT_DATA(const wxChar *) wxStaticPictureNameStr = wxT("message");
-const wxChar * wxStaticPictureNameStr = wxT("message");