Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

draw the sashes without wxSP_3DSASH flag nicer

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-10-26 21:25:45 +00:00
parent 110904ad7e
commit a35b6da53a
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/generic/splitter.cpp
View File

@@ -21,19 +21,22 @@
#endif #endif
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/string.h"
#include "wx/utils.h"
#include "wx/log.h"
#include "wx/dcscreen.h"
#include "wx/window.h" #include "wx/window.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/frame.h" #include "wx/frame.h"
#include "wx/settings.h"
#endif #endif
#include <stdlib.h>
#include "wx/string.h"
#include "wx/splitter.h" #include "wx/splitter.h"
#include "wx/dcscreen.h"
#include "wx/settings.h" #include <stdlib.h>
#include "wx/log.h"
#include "wx/utils.h"
DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED) DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED)
DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING) DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING)
@@ -540,7 +543,7 @@ void wxSplitterWindow::DrawSash(wxDC& dc)
dc.DrawLine(m_sashPosition+1, h-m_borderSize-1, m_sashPosition+m_sashSize-1, h-m_borderSize-1); dc.DrawLine(m_sashPosition+1, h-m_borderSize-1, m_sashPosition+m_sashSize-1, h-m_borderSize-1);
} }
} }
else else // wxSPLIT_HORIZONTAL
{ {
dc.SetPen(*m_facePen); dc.SetPen(*m_facePen);
if (HasFlag( wxSP_SASH_AQUA )) if (HasFlag( wxSP_SASH_AQUA ))
@@ -580,12 +583,12 @@ void wxSplitterWindow::DrawSash(wxDC& dc)
} }
} }
} }
else else // !wxSP_3DSASH
{ {
dc.SetPen(*wxTRANSPARENT_PEN);
dc.SetBrush(*m_faceBrush);
if ( m_splitMode == wxSPLIT_VERTICAL ) if ( m_splitMode == wxSPLIT_VERTICAL )
{ {
dc.SetPen(*wxBLACK_PEN);
dc.SetBrush(*wxBLACK_BRUSH);
int h1 = h-1; int h1 = h-1;
int y1 = 0; int y1 = 0;
if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER && (GetWindowStyleFlag() & wxSP_3DBORDER) != wxSP_3DBORDER ) if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER && (GetWindowStyleFlag() & wxSP_3DBORDER) != wxSP_3DBORDER )
@@ -596,10 +599,8 @@ void wxSplitterWindow::DrawSash(wxDC& dc)
} }
dc.DrawRectangle(m_sashPosition, y1, m_sashSize, h1); dc.DrawRectangle(m_sashPosition, y1, m_sashSize, h1);
} }
else else // wxSPLIT_HORIZONTAL
{ {
dc.SetPen(*wxBLACK_PEN);
dc.SetBrush(*wxBLACK_BRUSH);
int w1 = w-1; int w1 = w-1;
int x1 = 0; int x1 = 0;
if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER && (GetWindowStyleFlag() & wxSP_3DBORDER) != wxSP_3DBORDER ) if ( (GetWindowStyleFlag() & wxSP_BORDER) != wxSP_BORDER && (GetWindowStyleFlag() & wxSP_3DBORDER) != wxSP_3DBORDER )
@@ -610,7 +611,6 @@ void wxSplitterWindow::DrawSash(wxDC& dc)
} }
dc.DrawRectangle(x1, m_sashPosition, w1, m_sashSize); dc.DrawRectangle(x1, m_sashPosition, w1, m_sashSize);
} }
} }
dc.SetPen(wxNullPen); dc.SetPen(wxNullPen);