Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed extra semicolons to fix compilation with gcc -Wpedantic (patch 1701236)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@45498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-04-16 13:03:05 +00:00
parent 6a0da7e4b9
commit 6dced616e6
43 changed files with 230 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,7 +56,7 @@ public:
bool operator != (const wxColour& colour) const { return !(*this == colour); }
WXCOLORREF GetPixel() const { return m_pixel; };
WXCOLORREF GetPixel() const { return m_pixel; }
public:

4
include/wx/msw/control.h
View File

@@ -59,8 +59,8 @@ public:
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
// For ownerdraw items
virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return false; };
virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return false; };
virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return false; }
virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return false; }
const wxArrayLong& GetSubcontrols() const { return m_subControls; }

4
include/wx/msw/frame.h
View File

@@ -70,9 +70,9 @@ public:
// TODO: should this go into a wxFrameworkSettings class perhaps?
static void UseNativeStatusBar(bool useNative)
{ m_useNativeStatusBar = useNative; };
{ m_useNativeStatusBar = useNative; }
static bool UsesNativeStatusBar()
{ return m_useNativeStatusBar; };
{ return m_useNativeStatusBar; }
#endif // wxUSE_STATUSBAR
#if wxUSE_MENUS

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

@@ -62,7 +62,7 @@ public:
virtual wxMDIClientWindow *OnCreateClient(void);
// MDI windows menu
wxMenu* GetWindowMenu() const { return m_windowMenu; };
wxMenu* GetWindowMenu() const { return m_windowMenu; }
void SetWindowMenu(wxMenu* menu) ;
virtual void DoMenuUpdates(wxMenu* menu = NULL);

2
include/wx/msw/ole/automtn.h
View File

@@ -38,7 +38,7 @@ public:
virtual ~wxAutomationObject();
// Set/get dispatch pointer
inline void SetDispatchPtr(WXIDISPATCH* dispatchPtr) { m_dispatchPtr = dispatchPtr; };
inline void SetDispatchPtr(WXIDISPATCH* dispatchPtr) { m_dispatchPtr = dispatchPtr; }
inline WXIDISPATCH* GetDispatchPtr() const { return m_dispatchPtr; }
// Get a dispatch pointer from the current object associated

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

@@ -103,20 +103,20 @@ public:
void SetJoin(int join);
void SetCap(int cap);
wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); };
int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); };
int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); };
wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); }
int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); }
int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); }
int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); }
int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); }
int GetDashes(wxDash **ptr) const
{
*ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
}
wxDash* GetDash() const { return (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*)NULL); };
inline int GetDashCount() const { return (M_PENDATA ? M_PENDATA->m_nbDash : 0); };
wxDash* GetDash() const { return (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*)NULL); }
inline int GetDashCount() const { 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); }
// Internal
bool RealizeResource();

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

@@ -193,7 +193,7 @@ public:
wxWindow *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const;
// MSW only: true if this control is part of the main control
virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; };
virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; }
#if wxUSE_TOOLTIPS
// MSW only: true if this window or any of its children have a tooltip