fix gpf in mdi sample with motif when child is closed

[wxWidgets.git] / src / generic / sashwin.cpp

diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index f026ed1b74840cad7508f69c155a841b11ee38ee..b2cd42c75979c77e7954acaa5e530d043fae5423 100644 (file)
--- a/src/generic/sashwin.cpp
+++ b/src/generic/sashwin.cpp
@@ -30,7 +30,8 @@
     #include "wx/settings.h"
 #endif
 
-#include <math.h>
+#include "wx/math.h"
+
 #include <stdlib.h>
 
 #include "wx/dcscreen.h"
@@ -80,7 +81,7 @@ void wxSashWindow::Init()
     m_maximumPaneSizeY = 10000;
     m_sashCursorWE = new wxCursor(wxCURSOR_SIZEWE);
     m_sashCursorNS = new wxCursor(wxCURSOR_SIZENS);
-    m_mouseCaptured = FALSE;
+    m_mouseCaptured = false;
     m_currentCursor = NULL;
 
     // Eventually, we'll respond to colour change messages
@@ -105,7 +106,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
     if (event.LeftDown())
     {
         CaptureMouse();
-        m_mouseCaptured = TRUE;
+        m_mouseCaptured = true;
 
         if ( sashHit != wxSASH_NONE )
         {
@@ -154,7 +155,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
         // Wasn't a proper drag
         if (m_mouseCaptured)
             ReleaseMouse();
-        m_mouseCaptured = FALSE;
+        m_mouseCaptured = false;
 
         wxScreenDC::EndDrawingOnTop();
         m_dragMode = wxSASH_DRAG_NONE;
@@ -166,7 +167,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
         m_dragMode = wxSASH_DRAG_NONE;
         if (m_mouseCaptured)
             ReleaseMouse();
-        m_mouseCaptured = FALSE;
+        m_mouseCaptured = false;
 
         // Erase old tracker
         DrawSashTracker(m_draggingEdge, m_oldX, m_oldY);
@@ -187,8 +188,8 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
         wxSashDragStatus status = wxSASH_STATUS_OK;
 
         // the new height and width of the window - if -1, it didn't change
-        int newHeight = -1,
-            newWidth = -1;
+        int newHeight = wxDefaultCoord,
+            newWidth = wxDefaultCoord;
 
         // NB: x and y may be negative and they're relative to the sash window
         //     upper left corner, while xp and yp are expressed in the parent
@@ -253,7 +254,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
                 break;
         }
 
-        if ( newHeight == -1 )
+        if ( newHeight == wxDefaultCoord )
         {
             // didn't change
             newHeight = h;
@@ -265,7 +266,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
             newHeight = wxMin(newHeight, m_maximumPaneSizeY);
         }
 
-        if ( newWidth == -1 )
+        if ( newWidth == wxDefaultCoord )
         {
             // didn't change
             newWidth = w;
@@ -289,7 +290,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
     {
         if (m_mouseCaptured)
            ReleaseMouse();
-        m_mouseCaptured = FALSE;
+        m_mouseCaptured = false;
     }
     else if (event.Moving() && !event.Dragging())
     {
@@ -483,8 +484,10 @@ void wxSashWindow::DrawSash(wxSashEdgePosition edge, wxDC& dc)
     wxPen darkShadowPen(m_darkShadowColour, 1, wxSOLID);
     wxPen lightShadowPen(m_lightShadowColour, 1, wxSOLID);
     wxPen hilightPen(m_hilightColour, 1, wxSOLID);
-    wxPen blackPen(wxColour(0, 0, 0), 1, wxSOLID);
-    wxPen whitePen(wxColour(255, 255, 255), 1, wxSOLID);
+    wxColour blackClr(0, 0, 0);
+    wxColour whiteClr(255, 255, 255);
+    wxPen blackPen(blackClr, 1, wxSOLID);
+    wxPen whitePen(whiteClr, 1, wxSOLID);
 
     if ( edge == wxSASH_LEFT || edge == wxSASH_RIGHT )
     {
@@ -670,19 +673,11 @@ void wxSashWindow::SizeWindows()
 void wxSashWindow::InitColours()
 {
     // Shadow colours
-#ifndef __WIN16__
     m_faceColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
     m_mediumShadowColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW);
     m_darkShadowColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW);
     m_lightShadowColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);
     m_hilightColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT);
-#else
-    m_faceColour = wxTheColourDatabase->Find("LIGHT GREY");
-    m_mediumShadowColour = wxTheColourDatabase->Find("GREY");
-    m_darkShadowColour = wxTheColourDatabase->Find("BLACK");
-    m_lightShadowColour = wxTheColourDatabase->Find("LIGHT GREY");
-    m_hilightColour = wxTheColourDatabase->Find("WHITE");
-#endif
 }
 
 void wxSashWindow::SetSashVisible(wxSashEdgePosition edge, bool sash)