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/motif/dcclient.h
View File

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

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

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