removed extra semicolons (patch #1700459; fixes compilation with gcc's -pedantic flag)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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:
|
||||
|
@@ -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; }
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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);
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -201,7 +201,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
|
||||
|
Reference in New Issue
Block a user