projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow to customize wxGrid column auto-sizing.
[wxWidgets.git]
/
src
/
os2
/
pen.cpp
diff --git
a/src/os2/pen.cpp
b/src/os2/pen.cpp
index 301c86059c7b448671fa1f0f79a5bf108f1089da..c1c9f7253ca7159d8d946c3cf4f831e50f6d0e2f 100644
(file)
--- a/
src/os2/pen.cpp
+++ b/
src/os2/pen.cpp
@@
-77,7
+77,7
@@
private:
wxColour m_vColour;
WXHPEN m_hPen;// in OS/2 GPI this will be the PS the pen is associated with
wxColour m_vColour;
WXHPEN m_hPen;// in OS/2 GPI this will be the PS the pen is associated with
- DECLARE_NO_ASSIGN_CLASS(wxPenRefData)
+ wxDECLARE_NO_ASSIGN_CLASS(wxPenRefData);
};
#define M_PENDATA ((wxPenRefData *)m_refData)
};
#define M_PENDATA ((wxPenRefData *)m_refData)
@@
-171,7
+171,7
@@
wxPen::wxPen(
bool wxPen::operator==(const wxPen& pen) const
{
const wxPenRefData *
bool wxPen::operator==(const wxPen& pen) const
{
const wxPenRefData *
- penData =
wx_static_cast(const wxPenRefData *,
pen.m_refData);
+ penData =
static_cast<const wxPenRefData *>(
pen.m_refData);
// an invalid pen is only equal to another invalid pen
return m_refData ? penData && *M_PENDATA == *penData : !penData;
// an invalid pen is only equal to another invalid pen
return m_refData ? penData && *M_PENDATA == *penData : !penData;
@@
-219,7
+219,7
@@
bool wxPen::RealizeResource()
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- wxLogError(
_
T("Unable to set current color table to RGB mode. Error: %s\n"), sError.c_str());
+ wxLogError(
wx
T("Unable to set current color table to RGB mode. Error: %s\n"), sError.c_str());
return false;
}
if (M_PENDATA->m_nStyle == wxPENSTYLE_TRANSPARENT)
return false;
}
if (M_PENDATA->m_nStyle == wxPENSTYLE_TRANSPARENT)
@@
-285,7
+285,7
@@
bool wxPen::RealizeResource()
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- wxLogError(
_
T("Can't set Gpi attributes for a LINEBUNDLE. Error: %s\n"), sError.c_str());
+ wxLogError(
wx
T("Can't set Gpi attributes for a LINEBUNDLE. Error: %s\n"), sError.c_str());
return false;
}
return false;
}
@@
-370,7
+370,7
@@
bool wxPen::RealizeResource()
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- wxLogError(
_
T("Can't set Gpi attributes for an AREABUNDLE. Error: %s\n"), sError.c_str());
+ wxLogError(
wx
T("Can't set Gpi attributes for an AREABUNDLE. Error: %s\n"), sError.c_str());
}
return (bool)bOk;
}
return (bool)bOk;
@@
-408,7
+408,7
@@
wxGDIRefData* wxPen::CreateGDIRefData() const
wxGDIRefData* wxPen::CloneGDIRefData(const wxGDIRefData* data) const
{
wxGDIRefData* wxPen::CloneGDIRefData(const wxGDIRefData* data) const
{
- return new wxPenRefData(*
wx_static_cast(const wxPenRefData*,
data));
+ return new wxPenRefData(*
static_cast<const wxPenRefData*>(
data));
}
void wxPen::SetColour( const wxColour& rColour )
}
void wxPen::SetColour( const wxColour& rColour )
@@
-490,49
+490,49
@@
void wxPen::SetCap(
wxColour wxPen::GetColour() const
{
wxColour wxPen::GetColour() const
{
- wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
+ wxCHECK_MSG(
Is
Ok(), wxNullColour, wxT("invalid pen") );
return M_PENDATA->m_vColour;
}
int wxPen::GetWidth() const
{
return M_PENDATA->m_vColour;
}
int wxPen::GetWidth() const
{
- wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+ wxCHECK_MSG(
Is
Ok(), -1, wxT("invalid pen") );
return M_PENDATA->m_nWidth;
}
wxPenStyle wxPen::GetStyle() const
{
return M_PENDATA->m_nWidth;
}
wxPenStyle wxPen::GetStyle() const
{
- wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") );
+ wxCHECK_MSG(
Is
Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") );
return M_PENDATA->m_nStyle;
}
wxPenJoin wxPen::GetJoin() const
{
return M_PENDATA->m_nStyle;
}
wxPenJoin wxPen::GetJoin() const
{
- wxCHECK_MSG( Ok(), wxJOIN_INVALID, wxT("invalid pen") );
+ wxCHECK_MSG(
Is
Ok(), wxJOIN_INVALID, wxT("invalid pen") );
return M_PENDATA->m_nJoin;
}
wxPenCap wxPen::GetCap() const
{
return M_PENDATA->m_nJoin;
}
wxPenCap wxPen::GetCap() const
{
- wxCHECK_MSG( Ok(), wxCAP_INVALID, wxT("invalid pen") );
+ wxCHECK_MSG(
Is
Ok(), wxCAP_INVALID, wxT("invalid pen") );
return M_PENDATA->m_nCap;
}
int wxPen::GetPS() const
{
return M_PENDATA->m_nCap;
}
int wxPen::GetPS() const
{
- wxCHECK_MSG( Ok(), 0, wxT("invalid pen") );
+ wxCHECK_MSG(
Is
Ok(), 0, wxT("invalid pen") );
return M_PENDATA->m_hPen;
}
int wxPen::GetDashes(wxDash** ptr) const
{
return M_PENDATA->m_hPen;
}
int wxPen::GetDashes(wxDash** ptr) const
{
- wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+ wxCHECK_MSG(
Is
Ok(), -1, wxT("invalid pen") );
*ptr = M_PENDATA->m_dash;
return M_PENDATA->m_nbDash;
*ptr = M_PENDATA->m_dash;
return M_PENDATA->m_nbDash;
@@
-540,21
+540,21
@@
int wxPen::GetDashes(wxDash** ptr) const
wxDash* wxPen::GetDash() const
{
wxDash* wxPen::GetDash() const
{
- wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") );
+ wxCHECK_MSG(
Is
Ok(), NULL, wxT("invalid pen") );
return M_PENDATA->m_dash;
}
int wxPen::GetDashCount() const
{
return M_PENDATA->m_dash;
}
int wxPen::GetDashCount() const
{
- wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+ wxCHECK_MSG(
Is
Ok(), -1, wxT("invalid pen") );
return M_PENDATA->m_nbDash;
}
wxBitmap* wxPen::GetStipple() const
{
return M_PENDATA->m_nbDash;
}
wxBitmap* wxPen::GetStipple() const
{
- wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") );
+ wxCHECK_MSG(
Is
Ok(), NULL, wxT("invalid pen") );
return &(M_PENDATA->m_vStipple);
}
return &(M_PENDATA->m_vStipple);
}