restored "#ifdef __WXMSW__" around SetFont(wxNullFont) - this leads to SIGSEGV

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

diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index 2f53738112fc6546364547d891a8afeae7c77bcb..f64ebd1805624fb61e61156dde3c4421b61c600e 100644 (file)
--- a/src/generic/sashwin.cpp
+++ b/src/generic/sashwin.cpp
@@ -198,6 +198,10 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
                 dragRect = wxRect(xp, yp, newWidth, h);
                 break;
             }
+           case wxSASH_NONE:
+           {
+               break;
+           }
         }
 
         wxSashEvent event(GetId(), edge);
@@ -271,7 +275,7 @@ void wxSashWindow::OnSize(wxSizeEvent& WXUNUSED(event))
     SizeWindows();
 }
 
-wxSashEdgePosition wxSashWindow::SashHitTest(int x, int y, int tolerance)
+wxSashEdgePosition wxSashWindow::SashHitTest(int x, int y, int WXUNUSED(tolerance))
 {
     int cx, cy;
     GetClientSize(& cx, & cy);
@@ -310,6 +314,10 @@ wxSashEdgePosition wxSashWindow::SashHitTest(int x, int y, int tolerance)
                         return wxSASH_LEFT;
                     break;
                 }
+                case wxSASH_NONE:
+                {
+                    break;
+                }
             }
         }
     }
@@ -570,7 +578,7 @@ void wxSashWindow::InitColours()
     m_hilightColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT);
 #else
     m_faceColour = *(wxTheColourDatabase->FindColour("LIGHT GREY"));
-    m_mediumShadowColour = *(wxTheColourDatabase->FindColour("GREY", 1, wxSOLID));
+    m_mediumShadowColour = *(wxTheColourDatabase->FindColour("GREY"));
     m_darkShadowColour = *(wxTheColourDatabase->FindColour("BLACK"));
     m_lightShadowColour = *(wxTheColourDatabase->FindColour("LIGHT GREY"));
     m_hilightColour = *(wxTheColourDatabase->FindColour("WHITE"));