Fixed GetIcon to keep up with return type change on all other platforms.

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

diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index 6f0fc70c246a6e74ff01fe1f88c3c45aa857a32b..945582381a1df054bf5c540ce89116056c0241c3 100644 (file)
--- a/src/generic/sashwin.cpp
+++ b/src/generic/sashwin.cpp
@@ -8,13 +8,9 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "sashwin.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -30,7 +26,8 @@
     #include "wx/settings.h"
 #endif
 
     #include "wx/settings.h"
 #endif
 

-#include <math.h>
+#include "wx/math.h"
+

 #include <stdlib.h>
 
 #include "wx/dcscreen.h"
 #include <stdlib.h>
 
 #include "wx/dcscreen.h"


@@ -46,7 +43,7 @@ BEGIN_EVENT_TABLE(wxSashWindow, wxWindow)
     EVT_PAINT(wxSashWindow::OnPaint)
     EVT_SIZE(wxSashWindow::OnSize)
     EVT_MOUSE_EVENTS(wxSashWindow::OnMouseEvent)
     EVT_PAINT(wxSashWindow::OnPaint)
     EVT_SIZE(wxSashWindow::OnSize)
     EVT_MOUSE_EVENTS(wxSashWindow::OnMouseEvent)

-#ifdef __WXMSW__
+#if defined( __WXMSW__ ) || defined( __WXMAC__)

     EVT_SET_CURSOR(wxSashWindow::OnSetCursor)
 #endif // wxMSW
 
     EVT_SET_CURSOR(wxSashWindow::OnSetCursor)
 #endif // wxMSW
 


@@ -80,7 +77,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 +102,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 +151,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 +163,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 +184,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 = 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
 
         // 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 +250,7 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
                 break;
         }
 
                 break;
         }
 

-        if ( newHeight == -1 )
+        if ( newHeight == wxDefaultCoord )

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


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

-        if ( newWidth == -1 )
+        if ( newWidth == wxDefaultCoord )

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


@@ -279,17 +276,17 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
 
         dragRect = wxRect(x, y, newWidth, newHeight);
 
 
         dragRect = wxRect(x, y, newWidth, newHeight);
 

-        wxSashEvent event(GetId(), edge);
-        event.SetEventObject(this);
-        event.SetDragStatus(status);
-        event.SetDragRect(dragRect);
-        GetEventHandler()->ProcessEvent(event);
+        wxSashEvent eventSash(GetId(), edge);
+        eventSash.SetEventObject(this);
+        eventSash.SetDragStatus(status);
+        eventSash.SetDragRect(dragRect);
+        GetEventHandler()->ProcessEvent(eventSash);

     }
     else if ( event.LeftUp() )
     {
         if (m_mouseCaptured)
            ReleaseMouse();
     }
     else if ( event.LeftUp() )
     {
         if (m_mouseCaptured)
            ReleaseMouse();

-        m_mouseCaptured = FALSE;
+        m_mouseCaptured = false;

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


@@ -483,16 +480,14 @@ 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 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 )
     {
 
     if ( edge == wxSASH_LEFT || edge == wxSASH_RIGHT )
     {

-        int sashPosition = 0;
-        if (edge == wxSASH_LEFT)
-            sashPosition = 0;
-        else
-            sashPosition = w - GetEdgeMargin(edge);
+        int sashPosition = (edge == wxSASH_LEFT) ? 0 : ( w - GetEdgeMargin(edge) );

 
         dc.SetPen(facePen);
         dc.SetBrush(faceBrush);
 
         dc.SetPen(facePen);
         dc.SetBrush(faceBrush);


@@ -518,11 +513,7 @@ void wxSashWindow::DrawSash(wxSashEdgePosition edge, wxDC& dc)
     }
     else // top or bottom
     {
     }
     else // top or bottom
     {

-        int sashPosition = 0;
-        if (edge == wxSASH_TOP)
-            sashPosition = 0;
-        else
-            sashPosition = h - GetEdgeMargin(edge);
+        int sashPosition = (edge == wxSASH_TOP) ? 0 : ( h - GetEdgeMargin(edge) );

 
         dc.SetPen(facePen);
         dc.SetBrush(faceBrush);
 
         dc.SetPen(facePen);
         dc.SetBrush(faceBrush);


@@ -617,9 +608,9 @@ void wxSashWindow::SizeWindows()
     int cw, ch;
     GetClientSize(&cw, &ch);
 
     int cw, ch;
     GetClientSize(&cw, &ch);
 

-    if (GetChildren().Number() == 1)
+    if (GetChildren().GetCount() == 1)

     {
     {

-        wxWindow* child = (wxWindow*) (GetChildren().First()->Data());
+        wxWindow* child = GetChildren().GetFirst()->GetData();

 
         int x = 0;
         int y = 0;
 
         int x = 0;
         int y = 0;


@@ -658,7 +649,7 @@ void wxSashWindow::SizeWindows()
 
         child->SetSize(x, y, width, height);
     }
 
         child->SetSize(x, y, width, height);
     }

-    else if (GetChildren().Number() > 1)
+    else if (GetChildren().GetCount() > 1)

     {
         // Perhaps multiple children are themselves sash windows.
         // TODO: this doesn't really work because the subwindows sizes/positions
     {
         // Perhaps multiple children are themselves sash windows.
         // TODO: this doesn't really work because the subwindows sizes/positions


@@ -678,19 +669,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->FindColour("LIGHT GREY"));
-    m_mediumShadowColour = *(wxTheColourDatabase->FindColour("GREY"));
-    m_darkShadowColour = *(wxTheColourDatabase->FindColour("BLACK"));
-    m_lightShadowColour = *(wxTheColourDatabase->FindColour("LIGHT GREY"));
-    m_hilightColour = *(wxTheColourDatabase->FindColour("WHITE"));
-#endif

 }
 
 void wxSashWindow::SetSashVisible(wxSashEdgePosition edge, bool sash)
 }
 
 void wxSashWindow::SetSashVisible(wxSashEdgePosition edge, bool sash)


@@ -702,7 +685,7 @@ void wxSashWindow::SetSashVisible(wxSashEdgePosition edge, bool sash)
         m_sashes[edge].m_margin = 0;
 }
 
         m_sashes[edge].m_margin = 0;
 }
 

-#ifdef __WXMSW__
+#if defined( __WXMSW__ ) || defined( __WXMAC__)

 
 // this is currently called (and needed) under MSW only...
 void wxSashWindow::OnSetCursor(wxSetCursorEvent& event)
 
 // this is currently called (and needed) under MSW only...
 void wxSashWindow::OnSetCursor(wxSetCursorEvent& event)