From ba161d7e9579de457aedcf24c75fd24a2c024534 Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Wed, 8 May 2002 14:17:22 +0000 Subject: [PATCH] corrected warnings when compiling with -Wall -W git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dc.h | 59 +++++++-------- include/wx/mac/window.h | 157 +++++++++++++++++++++------------------- src/common/appcmn.cpp | 19 ++++- 3 files changed, 127 insertions(+), 108 deletions(-) diff --git a/include/wx/dc.h b/include/wx/dc.h index c14bbea8ae..c414a9fdbe 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -37,9 +37,9 @@ class WXDLLEXPORT wxDrawObject public: wxDrawObject() - { - ResetBoundingBox(); - } + : m_isBBoxValid(FALSE) + , m_minX(0), m_minY(0), m_maxX(0), m_maxY(0) + { } virtual ~wxDrawObject() { } @@ -103,33 +103,34 @@ class WXDLLEXPORT wxDCBase : public wxObject { public: 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(); - - 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() { } @@ -781,7 +782,7 @@ private: class WXDLLEXPORT wxDCTextColourChanger { public: - wxDCTextColourChanger(wxDC& dc) : m_dc(dc) { } + wxDCTextColourChanger(wxDC& dc) : m_dc(dc), m_colFgOld() { } ~wxDCTextColourChanger() { diff --git a/include/wx/mac/window.h b/include/wx/mac/window.h index 8ab6a1c366..dd225fe5e7 100644 --- a/include/wx/mac/window.h +++ b/include/wx/mac/window.h @@ -31,21 +31,27 @@ class WXDLLEXPORT wxTopLevelWindowMac; class WXDLLEXPORT wxWindowMac: public wxWindowBase { - DECLARE_DYNAMIC_CLASS(wxWindowMac) - - friend class wxDC; - friend class wxPaintDC; - + DECLARE_DYNAMIC_CLASS(wxWindowMac) + + friend class wxDC; + friend class wxPaintDC; + 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, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr) + wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxPanelNameStr) { Init(); Create(parent, id, pos, size, style, name); @@ -144,12 +150,12 @@ public: // implementation from now on // -------------------------- - void MacClientToRootWindow( int *x , int *y ) const ; - void MacRootWindowToClient( int *x , int *y ) const ; - void MacWindowToRootWindow( int *x , int *y ) const ; - void MacRootWindowToWindow( int *x , int *y ) const ; + void MacClientToRootWindow( int *x , int *y ) const ; + void MacRootWindowToClient( int *x , int *y ) const ; + void MacWindowToRootWindow( int *x , int *y ) const ; + void MacRootWindowToWindow( int *x , int *y ) const ; - virtual wxString MacGetToolTipString( wxPoint &where ) ; + virtual wxString MacGetToolTipString( wxPoint &where ) ; // simple accessors // ---------------- @@ -203,71 +209,72 @@ public: bool IsUserEnabled() const { return IsEnabled(); } #endif // WXWIN_COMPATIBILITY -public : - static bool MacGetWindowFromPoint( const wxPoint &point , wxWindowMac** outWin ) ; - virtual bool MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) ; - virtual void MacRedraw( WXHRGN updatergn , long time , bool erase) ; - virtual bool MacCanFocus() const { return true ; } - - virtual bool MacDispatchMouseEvent(wxMouseEvent& event ) ; - // this should not be overriden in classes above wxWindowMac because it is called from its destructor via DeleteChildren - virtual void RemoveChild( wxWindowBase *child ); - virtual void MacPaintBorders( int left , int top ) ; - WXWindow MacGetRootWindow() const ; - wxTopLevelWindowMac* MacGetTopLevelWindow() const ; - - virtual WXWidget MacGetContainerForEmbedding() ; - - virtual long MacGetLeftBorderSize() const ; - virtual long MacGetRightBorderSize() const ; - virtual long MacGetTopBorderSize() const ; - virtual long MacGetBottomBorderSize() const ; - - static long MacRemoveBordersFromStyle( long style ) ; - virtual void MacSuperChangedPosition() ; - virtual void MacTopLevelWindowChangedPosition() ; - virtual void MacSuperShown( bool show ) ; - virtual void MacSuperEnabled( bool enable ) ; - bool MacIsReallyShown() const ; - virtual void Update() ; - // for compatibility - void MacUpdateImmediately() { Update() ; } - -// virtual bool MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* rootwin ) ; -// virtual void MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) ; -// virtual void MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin) ; - const wxBrush& MacGetBackgroundBrush() ; - const wxRegion& MacGetVisibleRegion() ; - bool MacIsWindowScrollbar( const wxScrollBar* sb ) { return (m_hScrollBar == sb || m_vScrollBar == sb) ; } - static wxWindowMac* s_lastMouseWindow ; +public: + static bool MacGetWindowFromPoint( const wxPoint &point , wxWindowMac** outWin ) ; + virtual bool MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) ; + virtual void MacRedraw( WXHRGN updatergn , long time , bool erase) ; + virtual bool MacCanFocus() const { return true ; } + + virtual bool MacDispatchMouseEvent(wxMouseEvent& event ) ; + // this should not be overriden in classes above wxWindowMac because it is called from its destructor via DeleteChildren + virtual void RemoveChild( wxWindowBase *child ); + virtual void MacPaintBorders( int left , int top ) ; + WXWindow MacGetRootWindow() const ; + wxTopLevelWindowMac* MacGetTopLevelWindow() const ; + + virtual WXWidget MacGetContainerForEmbedding() ; + + virtual long MacGetLeftBorderSize() const ; + virtual long MacGetRightBorderSize() const ; + virtual long MacGetTopBorderSize() const ; + virtual long MacGetBottomBorderSize() const ; + + static long MacRemoveBordersFromStyle( long style ) ; + virtual void MacSuperChangedPosition() ; + virtual void MacTopLevelWindowChangedPosition() ; + virtual void MacSuperShown( bool show ) ; + virtual void MacSuperEnabled( bool enable ) ; + bool MacIsReallyShown() const ; + virtual void Update() ; + // for compatibility + void MacUpdateImmediately() { Update() ; } + +// virtual bool MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* rootwin ) ; +// virtual void MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) ; +// virtual void MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin) ; + const wxBrush& MacGetBackgroundBrush() ; + const wxRegion& MacGetVisibleRegion() ; + bool MacIsWindowScrollbar( const wxScrollBar* sb ) + { return (m_hScrollBar == sb || m_vScrollBar == sb) ; } + static wxWindowMac* s_lastMouseWindow ; private: protected: -// RgnHandle m_macUpdateRgn ; -// bool m_macEraseOnRedraw ; - wxBrush m_macBackgroundBrush ; - wxRegion m_macVisibleRegion ; - int m_x ; - int m_y ; - int m_width ; - int m_height ; - - wxScrollBar* m_hScrollBar ; - wxScrollBar* m_vScrollBar ; - wxString m_label ; - - void MacCreateScrollBars( long style ) ; - void MacRepositionScrollBars() ; +// RgnHandle m_macUpdateRgn ; +// bool m_macEraseOnRedraw ; + wxBrush m_macBackgroundBrush ; + wxRegion m_macVisibleRegion ; + int m_x ; + int m_y ; + int m_width ; + int m_height ; + + wxScrollBar* m_hScrollBar ; + wxScrollBar* m_vScrollBar ; + wxString m_label ; + + void MacCreateScrollBars( long style ) ; + void MacRepositionScrollBars() ; // additional (MSW specific) flags - bool m_useCtl3D:1; // Using CTL3D for this control - bool m_backgroundTransparent:1; - bool m_mouseInWindow:1; - bool m_doubleClickAllowed:1; - bool m_winCaptured:1; + bool m_useCtl3D:1; // Using CTL3D for this control + bool m_backgroundTransparent:1; + bool m_mouseInWindow:1; + bool m_doubleClickAllowed:1; + bool m_winCaptured:1; // the size of one page for scrolling - int m_xThumbSize; - int m_yThumbSize; + int m_xThumbSize; + int m_yThumbSize; // WXHMENU m_hMenu; // Menu, if any diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index a53be00281..6a20f95878 100644 --- a/src/common/appcmn.cpp +++ b/src/common/appcmn.cpp @@ -250,7 +250,9 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) wxCMD_LINE_SWITCH, _T(""), OPTION_VERBOSE, - gettext_noop("generate verbose log messages") + gettext_noop("generate verbose log messages"), + wxCMD_LINE_VAL_NONE, + 0x0 }, #endif // wxUSE_LOG @@ -260,7 +262,8 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) _T(""), OPTION_THEME, gettext_noop("specify the theme to use"), - wxCMD_LINE_VAL_STRING + wxCMD_LINE_VAL_STRING, + 0x0 }, #endif // __WXUNIVERSAL__ @@ -273,12 +276,20 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) _T(""), OPTION_MODE, gettext_noop("specify display mode to use (e.g. 640x480-16)"), - wxCMD_LINE_VAL_STRING + wxCMD_LINE_VAL_STRING, + 0x0 }, #endif // __WXMGL__ // terminator - { wxCMD_LINE_NONE } + { + wxCMD_LINE_NONE, + _T(""), + _T(""), + _T(""), + wxCMD_LINE_VAL_NONE, + 0x0 + } }; parser.SetDesc(cmdLineDesc); -- 2.45.2