corrected warnings when compiling with -Wall -W
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -37,9 +37,9 @@ class WXDLLEXPORT wxDrawObject
|
|||||||
public:
|
public:
|
||||||
|
|
||||||
wxDrawObject()
|
wxDrawObject()
|
||||||
{
|
: m_isBBoxValid(FALSE)
|
||||||
ResetBoundingBox();
|
, m_minX(0), m_minY(0), m_maxX(0), m_maxY(0)
|
||||||
}
|
{ }
|
||||||
|
|
||||||
virtual ~wxDrawObject() { }
|
virtual ~wxDrawObject() { }
|
||||||
|
|
||||||
@@ -103,33 +103,34 @@ class WXDLLEXPORT wxDCBase : public wxObject
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxDCBase()
|
wxDCBase()
|
||||||
|
: m_colour(wxColourDisplay())
|
||||||
|
, m_ok(TRUE)
|
||||||
|
, m_clipping(FALSE)
|
||||||
|
, m_isInteractive(0)
|
||||||
|
, m_isBBoxValid(FALSE)
|
||||||
|
, m_logicalOriginX(0), m_logicalOriginY(0)
|
||||||
|
, m_deviceOriginX(0), m_deviceOriginY(0)
|
||||||
|
, m_logicalScaleX(1.0), m_logicalScaleY(1.0)
|
||||||
|
, m_userScaleX(1.0), m_userScaleY(1.0)
|
||||||
|
, m_scaleX(1.0), m_scaleY(1.0)
|
||||||
|
, m_signX(1), m_signY(1)
|
||||||
|
, m_minX(0), m_minY(0), m_maxX(0), m_maxY(0)
|
||||||
|
, m_clipX1(0), m_clipY1(0), m_clipX2(0), m_clipY2(0)
|
||||||
|
, m_logicalFunction(wxCOPY)
|
||||||
|
, m_backgroundMode(wxTRANSPARENT)
|
||||||
|
, m_mappingMode(wxMM_TEXT)
|
||||||
|
, m_pen()
|
||||||
|
, m_brush()
|
||||||
|
, m_backgroundBrush(*wxTRANSPARENT_BRUSH)
|
||||||
|
, m_textForegroundColour(*wxBLACK)
|
||||||
|
, m_textBackgroundColour(*wxWHITE)
|
||||||
|
, m_font()
|
||||||
|
#if wxUSE_PALETTE
|
||||||
|
, m_palette()
|
||||||
|
, m_hasCustomPalette(FALSE)
|
||||||
|
#endif // wxUSE_PALETTE
|
||||||
{
|
{
|
||||||
m_clipping = FALSE;
|
|
||||||
m_ok = TRUE;
|
|
||||||
|
|
||||||
ResetBoundingBox();
|
ResetBoundingBox();
|
||||||
|
|
||||||
m_signX = m_signY = 1;
|
|
||||||
|
|
||||||
m_logicalOriginX = m_logicalOriginY =
|
|
||||||
m_deviceOriginX = m_deviceOriginY = 0;
|
|
||||||
|
|
||||||
m_logicalScaleX = m_logicalScaleY =
|
|
||||||
m_userScaleX = m_userScaleY =
|
|
||||||
m_scaleX = m_scaleY = 1.0;
|
|
||||||
|
|
||||||
m_logicalFunction = wxCOPY;
|
|
||||||
|
|
||||||
m_backgroundMode = wxTRANSPARENT;
|
|
||||||
|
|
||||||
m_mappingMode = wxMM_TEXT;
|
|
||||||
|
|
||||||
m_backgroundBrush = *wxTRANSPARENT_BRUSH;
|
|
||||||
|
|
||||||
m_textForegroundColour = *wxBLACK;
|
|
||||||
m_textBackgroundColour = *wxWHITE;
|
|
||||||
|
|
||||||
m_colour = wxColourDisplay();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
~wxDCBase() { }
|
~wxDCBase() { }
|
||||||
@@ -781,7 +782,7 @@ private:
|
|||||||
class WXDLLEXPORT wxDCTextColourChanger
|
class WXDLLEXPORT wxDCTextColourChanger
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxDCTextColourChanger(wxDC& dc) : m_dc(dc) { }
|
wxDCTextColourChanger(wxDC& dc) : m_dc(dc), m_colFgOld() { }
|
||||||
|
|
||||||
~wxDCTextColourChanger()
|
~wxDCTextColourChanger()
|
||||||
{
|
{
|
||||||
|
@@ -38,7 +38,13 @@ class WXDLLEXPORT wxWindowMac: public wxWindowBase
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
wxWindowMac() { Init(); }
|
wxWindowMac()
|
||||||
|
: m_macBackgroundBrush()
|
||||||
|
, m_macVisibleRegion()
|
||||||
|
, m_x(0), m_y(0), m_width(0), m_height(0)
|
||||||
|
, m_hScrollBar(NULL), m_vScrollBar(NULL)
|
||||||
|
, m_label(wxEmptyString)
|
||||||
|
{ Init(); }
|
||||||
|
|
||||||
wxWindowMac(wxWindowMac *parent,
|
wxWindowMac(wxWindowMac *parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
@@ -203,7 +209,7 @@ public:
|
|||||||
bool IsUserEnabled() const { return IsEnabled(); }
|
bool IsUserEnabled() const { return IsEnabled(); }
|
||||||
#endif // WXWIN_COMPATIBILITY
|
#endif // WXWIN_COMPATIBILITY
|
||||||
|
|
||||||
public :
|
public:
|
||||||
static bool MacGetWindowFromPoint( const wxPoint &point , wxWindowMac** outWin ) ;
|
static bool MacGetWindowFromPoint( const wxPoint &point , wxWindowMac** outWin ) ;
|
||||||
virtual bool MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) ;
|
virtual bool MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) ;
|
||||||
virtual void MacRedraw( WXHRGN updatergn , long time , bool erase) ;
|
virtual void MacRedraw( WXHRGN updatergn , long time , bool erase) ;
|
||||||
@@ -238,7 +244,8 @@ public :
|
|||||||
// virtual void MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin) ;
|
// virtual void MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin) ;
|
||||||
const wxBrush& MacGetBackgroundBrush() ;
|
const wxBrush& MacGetBackgroundBrush() ;
|
||||||
const wxRegion& MacGetVisibleRegion() ;
|
const wxRegion& MacGetVisibleRegion() ;
|
||||||
bool MacIsWindowScrollbar( const wxScrollBar* sb ) { return (m_hScrollBar == sb || m_vScrollBar == sb) ; }
|
bool MacIsWindowScrollbar( const wxScrollBar* sb )
|
||||||
|
{ return (m_hScrollBar == sb || m_vScrollBar == sb) ; }
|
||||||
static wxWindowMac* s_lastMouseWindow ;
|
static wxWindowMac* s_lastMouseWindow ;
|
||||||
private:
|
private:
|
||||||
protected:
|
protected:
|
||||||
|
@@ -250,7 +250,9 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
|
|||||||
wxCMD_LINE_SWITCH,
|
wxCMD_LINE_SWITCH,
|
||||||
_T(""),
|
_T(""),
|
||||||
OPTION_VERBOSE,
|
OPTION_VERBOSE,
|
||||||
gettext_noop("generate verbose log messages")
|
gettext_noop("generate verbose log messages"),
|
||||||
|
wxCMD_LINE_VAL_NONE,
|
||||||
|
0x0
|
||||||
},
|
},
|
||||||
#endif // wxUSE_LOG
|
#endif // wxUSE_LOG
|
||||||
|
|
||||||
@@ -260,7 +262,8 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
|
|||||||
_T(""),
|
_T(""),
|
||||||
OPTION_THEME,
|
OPTION_THEME,
|
||||||
gettext_noop("specify the theme to use"),
|
gettext_noop("specify the theme to use"),
|
||||||
wxCMD_LINE_VAL_STRING
|
wxCMD_LINE_VAL_STRING,
|
||||||
|
0x0
|
||||||
},
|
},
|
||||||
#endif // __WXUNIVERSAL__
|
#endif // __WXUNIVERSAL__
|
||||||
|
|
||||||
@@ -273,12 +276,20 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
|
|||||||
_T(""),
|
_T(""),
|
||||||
OPTION_MODE,
|
OPTION_MODE,
|
||||||
gettext_noop("specify display mode to use (e.g. 640x480-16)"),
|
gettext_noop("specify display mode to use (e.g. 640x480-16)"),
|
||||||
wxCMD_LINE_VAL_STRING
|
wxCMD_LINE_VAL_STRING,
|
||||||
|
0x0
|
||||||
},
|
},
|
||||||
#endif // __WXMGL__
|
#endif // __WXMGL__
|
||||||
|
|
||||||
// terminator
|
// terminator
|
||||||
{ wxCMD_LINE_NONE }
|
{
|
||||||
|
wxCMD_LINE_NONE,
|
||||||
|
_T(""),
|
||||||
|
_T(""),
|
||||||
|
_T(""),
|
||||||
|
wxCMD_LINE_VAL_NONE,
|
||||||
|
0x0
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
parser.SetDesc(cmdLineDesc);
|
parser.SetDesc(cmdLineDesc);
|
||||||
|
Reference in New Issue
Block a user