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

moved wxDash typedef to gdicmn.h

Browse Source 
added wxXXXDash, platform dependant types for all ports
made using native dialogs the default in msw/setup0.h


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2000-03-13 14:34:35 +00:00
parent dfd2e67583
commit 236a9de39a
19 changed files with 103 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/motif/dcclient.cpp
View File

@@ -134,7 +134,7 @@ wxWindowDC::wxWindowDC()
m_currentPenWidth = 1;
m_currentPenJoin = -1;
m_currentPenDashCount = -1;
m_currentPenDash = (char*) NULL;
m_currentPenDash = (wxMOTIFDash*) NULL;
m_currentStyle = -1;
m_currentFill = -1;
// m_currentBkMode = wxTRANSPARENT;
@@ -159,7 +159,7 @@ wxWindowDC::wxWindowDC( wxWindow *window )
m_currentPenWidth = 1;
m_currentPenJoin = -1;
m_currentPenDashCount = -1;
m_currentPenDash = (char*) NULL;
m_currentPenDash = (wxMOTIFDash*) NULL;
m_currentStyle = -1;
m_currentFill = -1;
// m_currentBkMode = wxTRANSPARENT;
@@ -1514,7 +1514,7 @@ void wxWindowDC::SetPen( const wxPen &pen )
int old_pen_join = m_currentPenJoin;
int old_pen_cap = m_currentPenCap;
int old_pen_nb_dash = m_currentPenDashCount;
char *old_pen_dash = m_currentPenDash;
wxMOTIFDash *old_pen_dash = m_currentPenDash;
wxColour oldPenColour = m_currentColour;
m_currentColour = m_pen.GetColour ();
@@ -1524,7 +1524,7 @@ void wxWindowDC::SetPen( const wxPen &pen )
m_currentPenJoin = m_pen.GetJoin ();
m_currentPenCap = m_pen.GetCap ();
m_currentPenDashCount = m_pen.GetDashCount();
m_currentPenDash = m_pen.GetDash();
m_currentPenDash = (wxMOTIFDash*)m_pen.GetDash();
if (m_currentStyle == wxSTIPPLE)
m_currentStipple = * m_pen.GetStipple ();
@@ -1552,15 +1552,15 @@ void wxWindowDC::SetPen( const wxPen &pen )
int style;
int join;
int cap;
static const char dotted[] = {2, 5};
static const char short_dashed[] = {4, 4};
static const char long_dashed[] = {4, 8};
static const char dotted_dashed[] = {6, 6, 2, 6};
static const wxMOTIFDash dotted[] = {2, 5};
static const wxMOTIFDash short_dashed[] = {4, 4};
static const wxMOTIFDash long_dashed[] = {4, 8};
static const wxMOTIFDash dotted_dashed[] = {6, 6, 2, 6};
// We express dash pattern in pen width unit, so we are
// independent of zoom factor and so on...
int req_nb_dash;
const char *req_dash;
const wxMOTIFDash *req_dash;
switch (m_pen.GetStyle ())
{
@@ -1594,13 +1594,13 @@ void wxWindowDC::SetPen( const wxPen &pen )
case wxTRANSPARENT:
default:
style = LineSolid;
req_dash = NULL;
req_dash = (wxMOTIFDash*)NULL;
req_nb_dash = 0;
}
if (req_dash && req_nb_dash)
{
char *real_req_dash = new char[req_nb_dash];
wxMOTIFDash *real_req_dash = new wxMOTIFDash[req_nb_dash];
if (real_req_dash)
{
int factor = scaled_width == 0 ? 1 : scaled_width;