fixed bug #976725: "RETURN closes dialog instead of combobox dropdown" (applied fix...

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

diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index f026ed1b74840cad7508f69c155a841b11ee38ee..d00ab536136298ba99b9b01301ff7d0d6fb5ba40 100644 (file)
--- a/src/generic/sashwin.cpp
+++ b/src/generic/sashwin.cpp
@@ -80,7 +80,7 @@ void wxSashWindow::Init()
     m_maximumPaneSizeY = 10000;
     m_sashCursorWE = new wxCursor(wxCURSOR_SIZEWE);
     m_sashCursorNS = new wxCursor(wxCURSOR_SIZENS);
     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
     m_currentCursor = NULL;
 
     // Eventually, we'll respond to colour change messages


@@ -105,7 +105,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
     if (event.LeftDown())
     {
         CaptureMouse();
     if (event.LeftDown())
     {
         CaptureMouse();

-        m_mouseCaptured = TRUE;
+        m_mouseCaptured = true;

 
         if ( sashHit != wxSASH_NONE )
         {
 
         if ( sashHit != wxSASH_NONE )
         {


@@ -154,7 +154,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
         // Wasn't a proper drag
         if (m_mouseCaptured)
             ReleaseMouse();
         // Wasn't a proper drag
         if (m_mouseCaptured)
             ReleaseMouse();

-        m_mouseCaptured = FALSE;
+        m_mouseCaptured = false;

 
         wxScreenDC::EndDrawingOnTop();
         m_dragMode = wxSASH_DRAG_NONE;
 
         wxScreenDC::EndDrawingOnTop();
         m_dragMode = wxSASH_DRAG_NONE;


@@ -166,7 +166,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
         m_dragMode = wxSASH_DRAG_NONE;
         if (m_mouseCaptured)
             ReleaseMouse();
         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);
 
         // Erase old tracker
         DrawSashTracker(m_draggingEdge, m_oldX, m_oldY);


@@ -187,8 +187,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
         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 = wxDefaultSize.y,
+            newWidth = wxDefaultSize.x;

 
         // 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
 
         // 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 +253,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
                 break;
         }
 
                 break;
         }
 

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

         {
             // didn't change
             newHeight = h;
         {
             // didn't change
             newHeight = h;


@@ -265,7 +265,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
             newHeight = wxMin(newHeight, m_maximumPaneSizeY);
         }
 
             newHeight = wxMin(newHeight, m_maximumPaneSizeY);
         }
 

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

         {
             // didn't change
             newWidth = w;
         {
             // didn't change
             newWidth = w;


@@ -289,7 +289,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
     {
         if (m_mouseCaptured)
            ReleaseMouse();
     {
         if (m_mouseCaptured)
            ReleaseMouse();

-        m_mouseCaptured = FALSE;
+        m_mouseCaptured = false;

     }
     else if (event.Moving() && !event.Dragging())
     {
     }
     else if (event.Moving() && !event.Dragging())
     {


@@ -670,19 +670,11 @@ void wxSashWindow::SizeWindows()
 void wxSashWindow::InitColours()
 {
     // Shadow colours
 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);
     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)
 }
 
 void wxSashWindow::SetSashVisible(wxSashEdgePosition edge, bool sash)