attempt to fix a rare crash which happens when changing the number of columns in...

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

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 1d70eebd623700259a1b7957126e362d4f45072b..e0d1e1af70b9605c9bf577895e9df8eabefa0212 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -364,6 +364,8 @@ void wxWindowBase::Centre(int direction)
             }
         }
 
             }
         }
 

+        // there is no wxTopLevelWindow under wxMotif yet
+#ifndef __WXMOTIF__

         // we shouldn't center the dialog on the iconized window: under
         // Windows, for example, this places it completely off the screen
         if ( parent )
         // we shouldn't center the dialog on the iconized window: under
         // Windows, for example, this places it completely off the screen
         if ( parent )


@@ -374,6 +376,7 @@ void wxWindowBase::Centre(int direction)
                 parent = NULL;
             }
         }
                 parent = NULL;
             }
         }

+#endif // __WXMOTIF__

 
         // did we find the parent?
         if ( !parent )
 
         // did we find the parent?
         if ( !parent )


@@ -1949,7 +1952,7 @@ struct WXDLLEXPORT wxWindowNext
 
 void wxWindowBase::CaptureMouse()
 {
 
 void wxWindowBase::CaptureMouse()
 {

-    wxLogTrace(_T("mousecapture"), _T("CaptureMouse(0x%08x)"), this);
+    wxLogTrace(_T("mousecapture"), _T("CaptureMouse(%p)"), this);

 
     wxWindow *winOld = GetCapture();
     if ( winOld )
 
     wxWindow *winOld = GetCapture();
     if ( winOld )


@@ -1969,7 +1972,7 @@ void wxWindowBase::CaptureMouse()
 
 void wxWindowBase::ReleaseMouse()
 {
 
 void wxWindowBase::ReleaseMouse()
 {

-    wxLogTrace(_T("mousecapture"), _T("ReleaseMouse(0x%08x)"), this);
+    wxLogTrace(_T("mousecapture"), _T("ReleaseMouse(%p)"), this);

 
     wxASSERT_MSG( GetCapture() == this, wxT("attempt to release mouse, but this window hasn't captured it") );
 
 
     wxASSERT_MSG( GetCapture() == this, wxT("attempt to release mouse, but this window hasn't captured it") );
 


@@ -1986,7 +1989,7 @@ void wxWindowBase::ReleaseMouse()
     //else: stack is empty, no previous capture
 
     wxLogTrace(_T("mousecapture"),
     //else: stack is empty, no previous capture
 
     wxLogTrace(_T("mousecapture"),

-               _T("After ReleaseMouse() mouse is captured by 0x%08x"),
+               _T("After ReleaseMouse() mouse is captured by %p"),

                GetCapture());
 }
 
                GetCapture());
 }
 


@@ -2002,3 +2005,4 @@ wxWindow* wxGetTopLevelParent(wxWindow *win)
     return win;
 }
 
     return win;
 }
 

+// vi:sts=4:sw=4:et