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

2
include/wx/gdicmn.h
View File

@@ -324,6 +324,8 @@ public:
// Management of pens, brushes and fonts // Management of pens, brushes and fonts
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
typedef wxInt8 wxDash;
class WXDLLEXPORT wxPenList : public wxList class WXDLLEXPORT wxPenList : public wxList
{ {
DECLARE_DYNAMIC_CLASS(wxPenList) DECLARE_DYNAMIC_CLASS(wxPenList)

4
include/wx/gtk/pen.h
View File

@@ -21,7 +21,7 @@
#include "wx/gdiobj.h" #include "wx/gdiobj.h"
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include <gtk/gtk.h> #include <gtk/gtk.h> // only needed for wxGTKDash, should it go elsewhere..
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// classes // classes
@@ -29,8 +29,6 @@
class wxPen; class wxPen;
typedef wxInt8 wxDash;
#if GTK_CHECK_VERSION(1,2,7) #if GTK_CHECK_VERSION(1,2,7)
typedef gint8 wxGTKDash; typedef gint8 wxGTKDash;
#else #else

4
include/wx/gtk1/pen.h
View File

@@ -21,7 +21,7 @@
#include "wx/gdiobj.h" #include "wx/gdiobj.h"
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include <gtk/gtk.h> #include <gtk/gtk.h> // only needed for wxGTKDash, should it go elsewhere..
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// classes // classes
@@ -29,8 +29,6 @@
class wxPen; class wxPen;
typedef wxInt8 wxDash;
#if GTK_CHECK_VERSION(1,2,7) #if GTK_CHECK_VERSION(1,2,7)
typedef gint8 wxGTKDash; typedef gint8 wxGTKDash;
#else #else

10
include/wx/mac/pen.h
View File

@@ -20,7 +20,7 @@
#include "wx/colour.h" #include "wx/colour.h"
#include "wx/bitmap.h" #include "wx/bitmap.h"
typedef long wxDash ; typedef long wxMACDash;
class WXDLLEXPORT wxPen; class WXDLLEXPORT wxPen;
@@ -39,7 +39,7 @@ protected:
int m_cap ; int m_cap ;
wxBitmap m_stipple ; wxBitmap m_stipple ;
int m_nbDash ; int m_nbDash ;
wxDash * m_dash ; wxMACDash * m_dash ;
wxColour m_colour; wxColour m_colour;
/* TODO: implementation /* TODO: implementation
WXHPEN m_hPen; WXHPEN m_hPen;
@@ -81,8 +81,10 @@ public:
inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); }; inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); }; inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); }; inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
inline int GetDashes(wxDash **ptr) const { inline int GetDashes(wxDash **ptr) const
*ptr = (M_PENDATA ? M_PENDATA->m_dash : (wxDash*) NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 0); {
*ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
} }
inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); }; inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };

2
include/wx/motif/dcclient.h
View File

@@ -149,7 +149,7 @@ protected:
int m_currentPenJoin ; int m_currentPenJoin ;
int m_currentPenCap ; int m_currentPenCap ;
int m_currentPenDashCount ; int m_currentPenDashCount ;
char* m_currentPenDash ; wxMOTIFDash* m_currentPenDash ;
wxBitmap m_currentStipple ; wxBitmap m_currentStipple ;
int m_currentStyle ; int m_currentStyle ;
int m_currentFill ; int m_currentFill ;

12
include/wx/motif/pen.h
View File

@@ -20,7 +20,7 @@
#include "wx/colour.h" #include "wx/colour.h"
#include "wx/bitmap.h" #include "wx/bitmap.h"
typedef char wxDash ; typedef char wxMOTIFDash;
class WXDLLEXPORT wxPen; class WXDLLEXPORT wxPen;
@@ -39,7 +39,7 @@ protected:
int m_cap ; int m_cap ;
wxBitmap m_stipple ; wxBitmap m_stipple ;
int m_nbDash ; int m_nbDash ;
wxDash * m_dash ; wxMOTIFDash *m_dash ;
wxColour m_colour; wxColour m_colour;
}; };
@@ -78,11 +78,13 @@ public:
inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); }; inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); }; inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); }; inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
inline int GetDashes(wxDash **ptr) const { inline int GetDashes(wxDash **ptr) const
*ptr = (M_PENDATA ? M_PENDATA->m_dash : (wxDash*) NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 0); {
*ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
} }
inline int GetDashCount() const { return (M_PENDATA->m_nbDash); } inline int GetDashCount() const { return (M_PENDATA->m_nbDash); }
inline wxDash* GetDash() const { return (M_PENDATA->m_dash); } inline wxDash* GetDash() const { return (wxDash*)M_PENDATA->m_dash; }
inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); }; inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };

10
include/wx/msw/pen.h
View File

@@ -19,7 +19,7 @@
#include "wx/gdiobj.h" #include "wx/gdiobj.h"
#include "wx/bitmap.h" #include "wx/bitmap.h"
typedef WXDWORD wxDash ; typedef WXDWORD wxMSWDash;
class WXDLLEXPORT wxPen; class WXDLLEXPORT wxPen;
@@ -38,7 +38,7 @@ protected:
int m_cap ; int m_cap ;
wxBitmap m_stipple ; wxBitmap m_stipple ;
int m_nbDash ; int m_nbDash ;
wxDash * m_dash ; wxMSWDash * m_dash ;
wxColour m_colour; wxColour m_colour;
WXHPEN m_hPen; WXHPEN m_hPen;
}; };
@@ -78,8 +78,10 @@ public:
inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); }; inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); }; inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); }; inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
inline int GetDashes(wxDash **ptr) const { inline int GetDashes(wxDash **ptr) const
*ptr = (M_PENDATA ? M_PENDATA->m_dash : (wxDash*) NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 0); {
*ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
} }
inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); }; inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };

2
include/wx/msw/setup0.h
View File

@@ -471,7 +471,7 @@
// Define 1 for font size to be backward compatible // Define 1 for font size to be backward compatible
// to 1.63 and earlier. 1.64 and later define point // to 1.63 and earlier. 1.64 and later define point
// sizes to be compatible with Windows. // sizes to be compatible with Windows.
#define wxUSE_GENERIC_DIALOGS_IN_MSW 1 #define wxUSE_GENERIC_DIALOGS_IN_MSW 0
// Define 1 to use generic dialogs in Windows, even though // Define 1 to use generic dialogs in Windows, even though
// they duplicate native common dialog (e.g. wxColourDialog) // they duplicate native common dialog (e.g. wxColourDialog)
#define wxUSE_PENWINDOWS 0 #define wxUSE_PENWINDOWS 0

10
include/wx/os2/pen.h
View File

@@ -15,7 +15,7 @@
#include "wx/gdiobj.h" #include "wx/gdiobj.h"
#include "wx/bitmap.h" #include "wx/bitmap.h"
typedef long wxDash ; typedef long wxPMDash;
class WXDLLEXPORT wxPen; class WXDLLEXPORT wxPen;
@@ -34,7 +34,7 @@ protected:
int m_cap ; int m_cap ;
wxBitmap m_stipple ; wxBitmap m_stipple ;
int m_nbDash ; int m_nbDash ;
wxDash * m_dash ; wxPMDash * m_dash ;
wxColour m_colour; wxColour m_colour;
WXHPEN m_hPen; WXHPEN m_hPen;
}; };
@@ -74,8 +74,10 @@ public:
inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); }; inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); }; inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); }; inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
inline int GetDashes(wxDash **ptr) const { inline int GetDashes(wxDash **ptr) const
*ptr = (M_PENDATA ? M_PENDATA->m_dash : (wxDash*) NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 0); {
*ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
} }
inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); }; inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };

11
include/wx/qt/pen.h
View File

@@ -17,8 +17,9 @@
#endif #endif
#include "wx/gdiobj.h" #include "wx/gdiobj.h"
#include "wx/gdicmn.h"
typedef WXDWORD wxDash ; typedef WXDWORD wxQTDash;
class WXDLLEXPORT wxPen; class WXDLLEXPORT wxPen;
@@ -37,7 +38,7 @@ protected:
int m_cap ; int m_cap ;
wxBitmap m_stipple ; wxBitmap m_stipple ;
int m_nbDash ; int m_nbDash ;
wxDash * m_dash ; wxQTDash * m_dash;
wxColour m_colour; wxColour m_colour;
/* TODO: implementation /* TODO: implementation
WXHPEN m_hPen; WXHPEN m_hPen;
@@ -82,8 +83,10 @@ public:
inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); }; inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); }; inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); }; inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
inline int GetDashes(wxDash **ptr) const { inline int GetDashes(wxDash **ptr) const
*ptr = (M_PENDATA ? M_PENDATA->m_dash : NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 0); {
*ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*)NULL);
return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
} }
inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : NULL); }; inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : NULL); };

28
include/wx/stubs/pen.h
View File

@@ -20,7 +20,17 @@
#include "wx/colour.h" #include "wx/colour.h"
#include "wx/bitmap.h" #include "wx/bitmap.h"
typedef long wxDash ; // PORTERS, NB: this typedef is the platform specific type for dashes..
// change all occurences of XSTUBX in pen.h and pen.cpp to something
// meaningful for your port (eg. wxMSWDash, wxGTKDash) and change the
// type from long to whatever your platform requires.
typedef long wxXSTUBXDash;
// wxDash is typedef'd in gdicmn.h and is the type that should be used
// for all public interfaces. Convert parameters to the wxXSTUBXDash
// type for use inside the platform specific methods, and cast them
// back to wxDash again before passing back to the user. -- RL
class WXDLLEXPORT wxPen; class WXDLLEXPORT wxPen;
@@ -35,11 +45,11 @@ public:
protected: protected:
int m_width; int m_width;
int m_style; int m_style;
int m_join ; int m_join;
int m_cap ; int m_cap;
wxBitmap m_stipple ; wxBitmap m_stipple;
int m_nbDash ; int m_nbDash;
wxDash * m_dash ; wxXSTUBXDash *m_dash;
wxColour m_colour; wxColour m_colour;
/* TODO: implementation /* TODO: implementation
WXHPEN m_hPen; WXHPEN m_hPen;
@@ -81,8 +91,10 @@ public:
inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); }; inline int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); }; inline int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); }; inline int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
inline int GetDashes(wxDash **ptr) const { inline int GetDashes(wxDash **ptr) const
*ptr = (M_PENDATA ? M_PENDATA->m_dash : (wxDash*) NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 0); {
*ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*)NULL);
return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
} }
inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); }; inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };

8
src/mac/carbon/pen.cpp
View File

@@ -26,7 +26,7 @@ wxPenRefData::wxPenRefData()
m_join = wxJOIN_ROUND ; m_join = wxJOIN_ROUND ;
m_cap = wxCAP_ROUND ; m_cap = wxCAP_ROUND ;
m_nbDash = 0 ; m_nbDash = 0 ;
m_dash = 0 ; m_dash = (wxMACDash*)NULL;
/* TODO: null data /* TODO: null data
m_hPen = 0; m_hPen = 0;
*/ */
@@ -76,7 +76,7 @@ wxPen::wxPen(const wxColour& col, int Width, int Style)
M_PENDATA->m_join = wxJOIN_ROUND ; M_PENDATA->m_join = wxJOIN_ROUND ;
M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ;
M_PENDATA->m_nbDash = 0 ; M_PENDATA->m_nbDash = 0 ;
M_PENDATA->m_dash = 0 ; M_PENDATA->m_dash = (wxMACDash*)NULL;
RealizeResource(); RealizeResource();
@@ -94,7 +94,7 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
M_PENDATA->m_join = wxJOIN_ROUND ; M_PENDATA->m_join = wxJOIN_ROUND ;
M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ;
M_PENDATA->m_nbDash = 0 ; M_PENDATA->m_nbDash = 0 ;
M_PENDATA->m_dash = 0 ; M_PENDATA->m_dash = (wxMACDash*)NULL;
RealizeResource(); RealizeResource();
@@ -168,7 +168,7 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
Unshare(); Unshare();
M_PENDATA->m_nbDash = nb_dashes; M_PENDATA->m_nbDash = nb_dashes;
M_PENDATA->m_dash = (wxDash *)Dash; M_PENDATA->m_dash = (wxMACDash *)Dash;
RealizeResource(); RealizeResource();
} }

8
src/mac/pen.cpp
View File

@@ -26,7 +26,7 @@ wxPenRefData::wxPenRefData()
m_join = wxJOIN_ROUND ; m_join = wxJOIN_ROUND ;
m_cap = wxCAP_ROUND ; m_cap = wxCAP_ROUND ;
m_nbDash = 0 ; m_nbDash = 0 ;
m_dash = 0 ; m_dash = (wxMACDash*)NULL;
/* TODO: null data /* TODO: null data
m_hPen = 0; m_hPen = 0;
*/ */
@@ -76,7 +76,7 @@ wxPen::wxPen(const wxColour& col, int Width, int Style)
M_PENDATA->m_join = wxJOIN_ROUND ; M_PENDATA->m_join = wxJOIN_ROUND ;
M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ;
M_PENDATA->m_nbDash = 0 ; M_PENDATA->m_nbDash = 0 ;
M_PENDATA->m_dash = 0 ; M_PENDATA->m_dash = (wxMACDash*)NULL;
RealizeResource(); RealizeResource();
@@ -94,7 +94,7 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
M_PENDATA->m_join = wxJOIN_ROUND ; M_PENDATA->m_join = wxJOIN_ROUND ;
M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ;
M_PENDATA->m_nbDash = 0 ; M_PENDATA->m_nbDash = 0 ;
M_PENDATA->m_dash = 0 ; M_PENDATA->m_dash = (wxMACDash*)NULL;
RealizeResource(); RealizeResource();
@@ -168,7 +168,7 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
Unshare(); Unshare();
M_PENDATA->m_nbDash = nb_dashes; M_PENDATA->m_nbDash = nb_dashes;
M_PENDATA->m_dash = (wxDash *)Dash; M_PENDATA->m_dash = (wxMACDash *)Dash;
RealizeResource(); RealizeResource();
} }

22
src/motif/dcclient.cpp
View File

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

8
src/motif/pen.cpp
View File

@@ -26,7 +26,7 @@ wxPenRefData::wxPenRefData()
m_join = wxJOIN_ROUND ; m_join = wxJOIN_ROUND ;
m_cap = wxCAP_ROUND ; m_cap = wxCAP_ROUND ;
m_nbDash = 0 ; m_nbDash = 0 ;
m_dash = 0 ; m_dash = (wxMOTIFDash*)NULL;
} }
wxPenRefData::wxPenRefData(const wxPenRefData& data) wxPenRefData::wxPenRefData(const wxPenRefData& data)
@@ -69,7 +69,7 @@ wxPen::wxPen(const wxColour& col, int Width, int Style)
M_PENDATA->m_join = wxJOIN_ROUND ; M_PENDATA->m_join = wxJOIN_ROUND ;
M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ;
M_PENDATA->m_nbDash = 0 ; M_PENDATA->m_nbDash = 0 ;
M_PENDATA->m_dash = 0 ; M_PENDATA->m_dash = (wxMOTIFDash*)NULL;
RealizeResource(); RealizeResource();
@@ -87,7 +87,7 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
M_PENDATA->m_join = wxJOIN_ROUND ; M_PENDATA->m_join = wxJOIN_ROUND ;
M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ;
M_PENDATA->m_nbDash = 0 ; M_PENDATA->m_nbDash = 0 ;
M_PENDATA->m_dash = 0 ; M_PENDATA->m_dash = (wxMOTIFDash*)NULL;
RealizeResource(); RealizeResource();
@@ -161,7 +161,7 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
Unshare(); Unshare();
M_PENDATA->m_nbDash = nb_dashes; M_PENDATA->m_nbDash = nb_dashes;
M_PENDATA->m_dash = (wxDash *)Dash; M_PENDATA->m_dash = (wxMOTIFDash *)Dash;
RealizeResource(); RealizeResource();
} }

18
src/msw/pen.cpp
View File

@@ -41,7 +41,7 @@ wxPenRefData::wxPenRefData()
m_join = wxJOIN_ROUND ; m_join = wxJOIN_ROUND ;
m_cap = wxCAP_ROUND ; m_cap = wxCAP_ROUND ;
m_nbDash = 0 ; m_nbDash = 0 ;
m_dash = 0 ; m_dash = (wxMSWDash*)NULL;
m_hPen = 0; m_hPen = 0;
} }
@@ -89,7 +89,7 @@ wxPen::wxPen(const wxColour& col, int Width, int Style)
M_PENDATA->m_join = wxJOIN_ROUND ; M_PENDATA->m_join = wxJOIN_ROUND ;
M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ;
M_PENDATA->m_nbDash = 0 ; M_PENDATA->m_nbDash = 0 ;
M_PENDATA->m_dash = 0 ; M_PENDATA->m_dash = (wxMSWDash*)NULL;
M_PENDATA->m_hPen = 0 ; M_PENDATA->m_hPen = 0 ;
#ifndef __WIN32__ #ifndef __WIN32__
@@ -132,7 +132,7 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
M_PENDATA->m_join = wxJOIN_ROUND ; M_PENDATA->m_join = wxJOIN_ROUND ;
M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ;
M_PENDATA->m_nbDash = 0 ; M_PENDATA->m_nbDash = 0 ;
M_PENDATA->m_dash = 0 ; M_PENDATA->m_dash = (wxMSWDash*)NULL;
M_PENDATA->m_hPen = 0 ; M_PENDATA->m_hPen = 0 ;
RealizeResource(); RealizeResource();
@@ -236,17 +236,17 @@ bool wxPen::RealizeResource()
logb.lbColor = ms_colour; logb.lbColor = ms_colour;
wxDash *real_dash; wxMSWDash *real_dash;
if (M_PENDATA->m_style==wxUSER_DASH && M_PENDATA->m_nbDash && M_PENDATA->m_dash) if (M_PENDATA->m_style==wxUSER_DASH && M_PENDATA->m_nbDash && M_PENDATA->m_dash)
{ {
real_dash = new wxDash[M_PENDATA->m_nbDash]; real_dash = new wxMSWDash[M_PENDATA->m_nbDash];
int i; int i;
for (i=0; i<M_PENDATA->m_nbDash; i++) for (i=0; i<M_PENDATA->m_nbDash; i++)
real_dash[i] = M_PENDATA->m_dash[i] * M_PENDATA->m_width; real_dash[i] = M_PENDATA->m_dash[i] * M_PENDATA->m_width;
} }
else else
{ {
real_dash = 0; real_dash = (wxMSWDash*)NULL;
} }
// Win32s doesn't have ExtCreatePen function... // Win32s doesn't have ExtCreatePen function...
@@ -259,7 +259,7 @@ bool wxPen::RealizeResource()
M_PENDATA->m_style==wxUSER_DASH M_PENDATA->m_style==wxUSER_DASH
? M_PENDATA->m_nbDash ? M_PENDATA->m_nbDash
: 0, : 0,
(const DWORD*)real_dash ); real_dash );
} }
else else
{ {
@@ -377,7 +377,7 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
Unshare(); Unshare();
M_PENDATA->m_nbDash = nb_dashes; M_PENDATA->m_nbDash = nb_dashes;
M_PENDATA->m_dash = (wxDash *)Dash; M_PENDATA->m_dash = (wxMSWDash *)Dash;
RealizeResource(); RealizeResource();
} }

8
src/os2/pen.cpp
View File

@@ -33,7 +33,7 @@ wxPenRefData::wxPenRefData()
m_join = wxJOIN_ROUND ; m_join = wxJOIN_ROUND ;
m_cap = wxCAP_ROUND ; m_cap = wxCAP_ROUND ;
m_nbDash = 0 ; m_nbDash = 0 ;
m_dash = 0 ; m_dash = (wxPMDash*)NULL;
m_hPen = 0; m_hPen = 0;
} }
@@ -82,7 +82,7 @@ wxPen::wxPen(const wxColour& col, int Width, int Style)
M_PENDATA->m_join = wxJOIN_ROUND ; M_PENDATA->m_join = wxJOIN_ROUND ;
M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ;
M_PENDATA->m_nbDash = 0 ; M_PENDATA->m_nbDash = 0 ;
M_PENDATA->m_dash = 0 ; M_PENDATA->m_dash = (wxPMDash*)NULL;
M_PENDATA->m_hPen = 0 ; M_PENDATA->m_hPen = 0 ;
// TODO: // TODO:
@@ -108,7 +108,7 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
M_PENDATA->m_join = wxJOIN_ROUND ; M_PENDATA->m_join = wxJOIN_ROUND ;
M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ;
M_PENDATA->m_nbDash = 0 ; M_PENDATA->m_nbDash = 0 ;
M_PENDATA->m_dash = 0 ; M_PENDATA->m_dash = (wxPMDash*)NULL;
M_PENDATA->m_hPen = 0 ; M_PENDATA->m_hPen = 0 ;
RealizeResource(); RealizeResource();
@@ -213,7 +213,7 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
Unshare(); Unshare();
M_PENDATA->m_nbDash = nb_dashes; M_PENDATA->m_nbDash = nb_dashes;
M_PENDATA->m_dash = (wxDash *)Dash; M_PENDATA->m_dash = (wxPMDash *)Dash;
RealizeResource(); RealizeResource();
} }

10
src/qt/pen.cpp
View File

@@ -26,7 +26,7 @@ wxPenRefData::wxPenRefData()
m_join = wxJOIN_ROUND ; m_join = wxJOIN_ROUND ;
m_cap = wxCAP_ROUND ; m_cap = wxCAP_ROUND ;
m_nbDash = 0 ; m_nbDash = 0 ;
m_dash = 0 ; m_dash = (wxQTDash*)NULL;
/* TODO: null data /* TODO: null data
m_hPen = 0; m_hPen = 0;
*/ */
@@ -76,7 +76,7 @@ wxPen::wxPen(const wxColour& col, int Width, int Style)
M_PENDATA->m_join = wxJOIN_ROUND ; M_PENDATA->m_join = wxJOIN_ROUND ;
M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ;
M_PENDATA->m_nbDash = 0 ; M_PENDATA->m_nbDash = 0 ;
M_PENDATA->m_dash = 0 ; M_PENDATA->m_dash = (wxQTDash*)NULL;
RealizeResource(); RealizeResource();
@@ -94,7 +94,7 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
M_PENDATA->m_join = wxJOIN_ROUND ; M_PENDATA->m_join = wxJOIN_ROUND ;
M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ;
M_PENDATA->m_nbDash = 0 ; M_PENDATA->m_nbDash = 0 ;
M_PENDATA->m_dash = 0 ; M_PENDATA->m_dash = (wxQTDash*)NULL;
RealizeResource(); RealizeResource();
@@ -112,7 +112,7 @@ wxPen::wxPen(const wxString& col, int Width, int Style)
M_PENDATA->m_join = wxJOIN_ROUND ; M_PENDATA->m_join = wxJOIN_ROUND ;
M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ;
M_PENDATA->m_nbDash = 0 ; M_PENDATA->m_nbDash = 0 ;
M_PENDATA->m_dash = 0 ; M_PENDATA->m_dash = (wxQTDash*)NULL;
RealizeResource(); RealizeResource();
@@ -195,7 +195,7 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
Unshare(); Unshare();
M_PENDATA->m_nbDash = nb_dashes; M_PENDATA->m_nbDash = nb_dashes;
M_PENDATA->m_dash = (wxDash *)Dash; M_PENDATA->m_dash = (wxQTDash *)Dash;
RealizeResource(); RealizeResource();
} }

8
src/stubs/pen.cpp
View File

@@ -26,7 +26,7 @@ wxPenRefData::wxPenRefData()
m_join = wxJOIN_ROUND ; m_join = wxJOIN_ROUND ;
m_cap = wxCAP_ROUND ; m_cap = wxCAP_ROUND ;
m_nbDash = 0 ; m_nbDash = 0 ;
m_dash = 0 ; m_dash = (wxXSTUBXDash*)NULL;
/* TODO: null data /* TODO: null data
m_hPen = 0; m_hPen = 0;
*/ */
@@ -76,7 +76,7 @@ wxPen::wxPen(const wxColour& col, int Width, int Style)
M_PENDATA->m_join = wxJOIN_ROUND ; M_PENDATA->m_join = wxJOIN_ROUND ;
M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ;
M_PENDATA->m_nbDash = 0 ; M_PENDATA->m_nbDash = 0 ;
M_PENDATA->m_dash = 0 ; M_PENDATA->m_dash = (wxXSTUBXDash*)NULL;
RealizeResource(); RealizeResource();
@@ -94,7 +94,7 @@ wxPen::wxPen(const wxBitmap& stipple, int Width)
M_PENDATA->m_join = wxJOIN_ROUND ; M_PENDATA->m_join = wxJOIN_ROUND ;
M_PENDATA->m_cap = wxCAP_ROUND ; M_PENDATA->m_cap = wxCAP_ROUND ;
M_PENDATA->m_nbDash = 0 ; M_PENDATA->m_nbDash = 0 ;
M_PENDATA->m_dash = 0 ; M_PENDATA->m_dash = (wxXSTUBXDash*)NULL;
RealizeResource(); RealizeResource();
@@ -168,7 +168,7 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
Unshare(); Unshare();
M_PENDATA->m_nbDash = nb_dashes; M_PENDATA->m_nbDash = nb_dashes;
M_PENDATA->m_dash = (wxDash *)Dash; M_PENDATA->m_dash = (wxXSTUBXDash*)Dash;
RealizeResource(); RealizeResource();
} }