many fixes for PNG reading after recent alpha changes; grey scale images reading...

[wxWidgets.git] / src / common / wincmn.cpp

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 2d412932372efcff97cfc1dc96b5bdb655185cbe..5962b4b3532d460a4d03aed2e20aae60dcea8e6f 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -6,7 +6,7 @@
 // Created:     13/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team
 // Created:     13/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -149,6 +149,8 @@ void wxWindowBase::InitBase()
     m_hasBgCol =
     m_hasFgCol =
     m_hasFont = FALSE;
     m_hasBgCol =
     m_hasFgCol =
     m_hasFont = FALSE;

+    
+    m_isBeingDeleted = FALSE;

 
     // no style bits
     m_exStyle =
 
     // no style bits
     m_exStyle =


@@ -224,8 +226,14 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
                   _T("wxStaticBox can't be used as a window parent!") );
 #endif // wxUSE_STATBOX
 
                   _T("wxStaticBox can't be used as a window parent!") );
 #endif // wxUSE_STATBOX
 

+    // ids are limited to 16 bits under MSW so if you care about portability,
+    // it's not a good idea to use ids out of this range (and negative ids are
+    // reserved for wxWindows own usage)
+    wxASSERT_MSG( id == wxID_ANY || (id >= 0 && id < 32767),
+                  _T("invalid id value") );
+

     // generate a new id if the user doesn't care about it
     // generate a new id if the user doesn't care about it

-    m_windowId = id == -1 ? NewControlId() : id;
+    m_windowId = id == wxID_ANY ? NewControlId() : id;

 
     SetName(name);
     SetWindowStyleFlag(style);
 
     SetName(name);
     SetWindowStyleFlag(style);


@@ -618,7 +626,7 @@ void wxWindowBase::SetSizeHints(int minW, int minH,
     // setting min width greater than max width leads to infinite loops under
     // X11 and generally doesn't make any sense, so don't allow it
     wxCHECK_RET( (minW == -1 || maxW == -1 || minW <= maxW) &&
     // setting min width greater than max width leads to infinite loops under
     // X11 and generally doesn't make any sense, so don't allow it
     wxCHECK_RET( (minW == -1 || maxW == -1 || minW <= maxW) &&

-                    (minH == -1 || maxH == -1 || minH < maxH),
+                    (minH == -1 || maxH == -1 || minH <= maxH),

                  _T("min width/height must be less than max width/height!") );
 
     m_minWidth = minW;
                  _T("min width/height must be less than max width/height!") );
 
     m_minWidth = minW;