From 1262d4300533ab9ba277d551878c71998f0b1250 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@bullseye.com>
Date: Tue, 15 Apr 2014 17:39:19 +0000
Subject: [PATCH] remove extraneous semicolons

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/font.h             | 2 +-
 include/wx/osx/core/evtloop.h | 4 ++--
 include/wx/osx/core/private.h | 2 +-
 include/wx/propgrid/editors.h | 4 ++--
 include/wx/propgrid/manager.h | 4 ++--
 src/osx/cocoa/mediactrl.mm    | 4 ++--
 src/osx/cocoa/window.mm       | 4 ++--
 src/osx/core/bitmap.cpp       | 6 +++---
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/include/wx/font.h b/include/wx/font.h
index 10a6f0e5d7..5c359cce64 100644
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -419,7 +419,7 @@ public:
 
     // this doesn't do anything and is kept for compatibility only
 #if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_INLINE(void SetNoAntiAliasing(bool no = true), wxUnusedVar(no););
+    wxDEPRECATED_INLINE(void SetNoAntiAliasing(bool no = true), wxUnusedVar(no);)
     wxDEPRECATED_INLINE(bool GetNoAntiAliasing() const, return false;)
 #endif // WXWIN_COMPATIBILITY_2_8
 
diff --git a/include/wx/osx/core/evtloop.h b/include/wx/osx/core/evtloop.h
index d2ff91d4c2..f3e181f6c4 100644
--- a/include/wx/osx/core/evtloop.h
+++ b/include/wx/osx/core/evtloop.h
@@ -11,8 +11,8 @@
 #ifndef _WX_OSX_CORE_EVTLOOP_H_
 #define _WX_OSX_CORE_EVTLOOP_H_
 
-DECLARE_WXOSX_OPAQUE_CFREF( CFRunLoop );
-DECLARE_WXOSX_OPAQUE_CFREF( CFRunLoopObserver );
+DECLARE_WXOSX_OPAQUE_CFREF( CFRunLoop )
+DECLARE_WXOSX_OPAQUE_CFREF( CFRunLoopObserver )
 
 class WXDLLIMPEXP_FWD_BASE wxCFEventLoopPauseIdleEvents;
 
diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index 18c3cc7b89..f16850a083 100644
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -313,7 +313,7 @@ public :
     virtual void        SetBitmap( const wxBitmap& bitmap ) = 0;
     virtual void        SetBitmapPosition( wxDirection dir ) = 0;
     virtual void        SetupTabs( const wxNotebook& WXUNUSED(notebook) ) {}
-    virtual int         TabHitTest( const wxPoint & WXUNUSED(pt), long *flags ) {*flags=1; return -1;};
+    virtual int         TabHitTest( const wxPoint & WXUNUSED(pt), long *flags ) {*flags=1; return -1;}
     virtual void        GetBestRect( wxRect *r ) const = 0;
     virtual bool        IsEnabled() const = 0;
     virtual void        Enable( bool enable ) = 0;
diff --git a/include/wx/propgrid/editors.h b/include/wx/propgrid/editors.h
index 2f64ce10b0..475d274998 100644
--- a/include/wx/propgrid/editors.h
+++ b/include/wx/propgrid/editors.h
@@ -39,12 +39,12 @@ public:
     {
         m_primary = a;
         m_secondary = NULL;
-    };
+    }
     wxPGWindowList( wxWindow* a, wxWindow* b )
     {
         m_primary = a;
         m_secondary = b;
-    };
+    }
 };
 
 // -----------------------------------------------------------------------
diff --git a/include/wx/propgrid/manager.h b/include/wx/propgrid/manager.h
index 833254bcc6..12e977b667 100644
--- a/include/wx/propgrid/manager.h
+++ b/include/wx/propgrid/manager.h
@@ -329,13 +329,13 @@ public:
     {
         wxASSERT(m_pPropGrid);
         return m_pPropGrid;
-    };
+    }
 
     const wxPropertyGrid* GetGrid() const
     {
         wxASSERT(m_pPropGrid);
         return (const wxPropertyGrid*)m_pPropGrid;
-    };
+    }
 
     /** Returns iterator class instance.
         @remarks
diff --git a/src/osx/cocoa/mediactrl.mm b/src/osx/cocoa/mediactrl.mm
index 73624098c5..5a26b5c360 100644
--- a/src/osx/cocoa/mediactrl.mm
+++ b/src/osx/cocoa/mediactrl.mm
@@ -115,7 +115,7 @@ private:
 
     wxMediaCtrlPlayerControls m_interfaceflags; // Saved interface flags
 
-    DECLARE_DYNAMIC_CLASS(wxQTMediaBackend);
+    wxDECLARE_DYNAMIC_CLASS(wxQTMediaBackend);
 };
 
 // --------------------------------------------------------------------------
@@ -152,7 +152,7 @@ private:
 	[super dealloc];    
 }
 
--(wxQTMediaBackend*) backend;
+-(wxQTMediaBackend*) backend
 {
     return m_backend;
 }
diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index 80cd683c8c..a0576eb61a 100644
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -192,7 +192,7 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
     const UCKeyboardLayout *keyboardLayout = (const UCKeyboardLayout*)CFDataGetBytePtr(uchr);
     if (keyboardLayout) {
         UInt32 deadKeyState = 0;
-        UniCharCount maxStringLength = 255;
+        const UniCharCount maxStringLength = 255;
         UniCharCount actualStringLength = 0;
         UniChar unicodeString[maxStringLength];
         
@@ -788,7 +788,7 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEve
     [_lastToolTipOwner mouseEntered:fakeEvent];
 }
 
-- (void)setToolTip:(NSString *)string;
+- (void)setToolTip:(NSString *)string
 {
     if (string)
     {
diff --git a/src/osx/core/bitmap.cpp b/src/osx/core/bitmap.cpp
index 8ee6127b11..d157ad7c5e 100644
--- a/src/osx/core/bitmap.cpp
+++ b/src/osx/core/bitmap.cpp
@@ -1822,7 +1822,7 @@ class WXDLLEXPORT wxBundleResourceHandler: public wxBitmapHandler
 public:
     inline wxBundleResourceHandler()
     {
-    };
+    }
     
     virtual bool LoadFile(wxBitmap *bitmap,
                           const wxString& name,
@@ -1843,7 +1843,7 @@ public:
         SetName(wxT("PNG resource"));
         SetExtension("PNG");
         SetType(wxBITMAP_TYPE_PNG_RESOURCE);
-    };
+    }
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxPNGResourceHandler, wxBundleResourceHandler)
@@ -1858,7 +1858,7 @@ public:
         SetName(wxT("JPEG resource"));
         SetExtension("JPEG");
         SetType(wxBITMAP_TYPE_JPEG_RESOURCE);
-    };
+    }
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxJPEGResourceHandler, wxBundleResourceHandler)