disable the first top level parent, not the topmost top level parent

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

diff --git a/contrib/src/gizmos/statpict.cpp b/contrib/src/gizmos/statpict.cpp
index e3f39f4ec8158eaf7bbdc8d3bd83f877fc74d5f8..5f6ce086de753390535c2367a06389ae3ce50895 100644 (file)
--- a/contrib/src/gizmos/statpict.cpp
+++ b/contrib/src/gizmos/statpict.cpp
@@ -13,9 +13,10 @@
   #pragma implementation "statpict.h"
 #endif
 
   #pragma implementation "statpict.h"
 #endif
 

+#include "wx/wxprec.h"

 #include "wx/defs.h"
 
 #include "wx/defs.h"
 

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

 #include "wx/dcclient.h"
 
 #if !USE_SHARED_LIBRARY
 #include "wx/dcclient.h"
 
 #if !USE_SHARED_LIBRARY


@@ -42,9 +43,9 @@ bool wxStaticPicture::Create(wxWindow *parent, wxWindowID id,
     wxSize size = s ;
     if ( bitmap.Ok() )
     {
     wxSize size = s ;
     if ( bitmap.Ok() )
     {

-        if ( size.x == -1 )
+        if ( size.x == wxDefaultSize.x )

             size.x = bitmap.GetWidth() ;
             size.x = bitmap.GetWidth() ;

-        if ( size.y == -1 )
+        if ( size.y == wxDefaultSize.y )

             size.y = bitmap.GetHeight() ;
     }
 
             size.y = bitmap.GetHeight() ;
     }
 


@@ -62,7 +63,7 @@ bool wxStaticPicture::Create(wxWindow *parent, wxWindowID id,
         OriginalImage = Bitmap.ConvertToImage();
 #endif
 
         OriginalImage = Bitmap.ConvertToImage();
 #endif
 

-    if ( id == -1 )
+    if ( id == wxID_ANY )

         m_windowId = (int)NewControlId();
     else
         m_windowId = id;
         m_windowId = (int)NewControlId();
     else
         m_windowId = id;