Use wx-prefixed macros throughout the repository.

Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE
occurrences to use the wx-prefixed version of the macros.

include/wx/osx/accel.h

@@ -16,7 +16,7 @@
 
 class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject
 {
-DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
+    wxDECLARE_DYNAMIC_CLASS(wxAcceleratorTable);
 public:
     wxAcceleratorTable();
     wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array

include/wx/osx/anybutton.h

@@ -52,7 +52,7 @@ protected:
     wxBitmap m_bitmaps[State_Max];
 
     wxDECLARE_NO_COPY_CLASS(wxAnyButton);
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_OSX_ANYBUTTON_H_

include/wx/osx/app.h

@@ -33,7 +33,7 @@ bool WXDLLIMPEXP_CORE wxYield();
 // a new App object to start application
 class WXDLLIMPEXP_CORE wxApp: public wxAppBase
 {
-    DECLARE_DYNAMIC_CLASS(wxApp)
+    wxDECLARE_DYNAMIC_CLASS(wxApp);
 
     wxApp();
     virtual ~wxApp();
@@ -174,7 +174,7 @@ public:
     // Hide the application windows the same as the system hide command would do it.
     void MacHideApp();
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif

include/wx/osx/bitmap.h

@@ -32,7 +32,7 @@ class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
 
 class WXDLLIMPEXP_CORE wxMask: public wxObject
 {
-    DECLARE_DYNAMIC_CLASS(wxMask)
+    wxDECLARE_DYNAMIC_CLASS(wxMask);
 
 public:
     wxMask();
@@ -83,7 +83,7 @@ private:
 
 class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
 {
-    DECLARE_DYNAMIC_CLASS(wxBitmap)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmap);
 
     friend class WXDLLIMPEXP_FWD_CORE wxBitmapHandler;
 

include/wx/osx/bmpbuttn.h

@@ -42,7 +42,7 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
-    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmapButton);
 };
 
 #endif // _WX_OSX_BMPBUTTN_H_

include/wx/osx/brush.h

@@ -50,7 +50,7 @@ protected:
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxBrush)
+    wxDECLARE_DYNAMIC_CLASS(wxBrush);
 };
 
 #endif // _WX_BRUSH_H_

include/wx/osx/button.h

@@ -53,7 +53,7 @@ public:
 #endif
 
 protected:
-    DECLARE_DYNAMIC_CLASS(wxButton)
+    wxDECLARE_DYNAMIC_CLASS(wxButton);
 };
 
 // OS X specific class, not part of public wx API

include/wx/osx/carbon/dataview.h

@@ -315,7 +315,7 @@ private:
 //
 // wxWidget internal stuff
 //
-    DECLARE_ABSTRACT_CLASS(wxMacDataBrowserTableViewControl)
+    wxDECLARE_ABSTRACT_CLASS(wxMacDataBrowserTableViewControl);
 };
 
 // ============================================================================

include/wx/osx/carbon/drawer.h

@@ -24,7 +24,7 @@
 
 class WXDLLIMPEXP_ADV wxDrawerWindow : public wxTopLevelWindow
 {
-    DECLARE_DYNAMIC_CLASS(wxDrawerWindow)
+    wxDECLARE_DYNAMIC_CLASS(wxDrawerWindow);
 
 public:
 

include/wx/osx/carbon/private.h

@@ -440,7 +440,7 @@ protected :
     ControlRef  m_controlRef;
     wxFont      m_font;
     long        m_windowStyle;
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacControl)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMacControl);
 };
 
 // ============================================================================
@@ -581,7 +581,7 @@ protected :
     virtual Boolean CompareItems(DataBrowserItemID itemOneID,
         DataBrowserItemID itemTwoID,
         DataBrowserPropertyID sortProperty) = 0;
-    DECLARE_ABSTRACT_CLASS(wxMacDataBrowserControl)
+    wxDECLARE_ABSTRACT_CLASS(wxMacDataBrowserControl);
 };
 
 // ============================================================================
@@ -755,7 +755,7 @@ protected:
 private :
 
     bool m_suppressSelection;
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataItemBrowserControl)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataItemBrowserControl);
 };
 
 class WXDLLIMPEXP_CORE wxMacDataItemBrowserSelectionSuppressor
@@ -894,7 +894,7 @@ private:
     wxArrayMacDataBrowserColumns m_columns;
     int m_nextColumnId ;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataBrowserListControl)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataBrowserListControl);
 };
 
 // ============================================================================
@@ -1038,7 +1038,7 @@ protected :
     WXEVENTHANDLERREF   m_macEventHandler ;
     WindowRef           m_macWindow;
     void *              m_macFullScreenData ;
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCarbonImpl)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCarbonImpl);
 };
 
 #endif // wxUSE_GUI

include/wx/osx/carbon/private/print.h

@@ -55,7 +55,7 @@ protected :
     PMPrintSettings         m_macPrintSettings ;
     PMPaper                 m_macPaper;
 private:
-    DECLARE_DYNAMIC_CLASS(wxOSXPrintData)
+    wxDECLARE_DYNAMIC_CLASS(wxOSXPrintData);
 } ;
 
 WXDLLIMPEXP_CORE wxPrintNativeDataBase* wxOSXCreatePrintData();
@@ -67,7 +67,7 @@ public:
                             wxOSXCarbonPrintData();
     virtual                 ~wxOSXCarbonPrintData();
 private:
-    DECLARE_DYNAMIC_CLASS(wxOSXCarbonPrintData)
+    wxDECLARE_DYNAMIC_CLASS(wxOSXCarbonPrintData);
 } ;
 #endif
 
@@ -85,7 +85,7 @@ protected:
 
     WX_NSPrintInfo          m_macPrintInfo;
 private:
-    DECLARE_DYNAMIC_CLASS(wxOSXCocoaPrintData)
+    wxDECLARE_DYNAMIC_CLASS(wxOSXCocoaPrintData);
 } ;
 #endif
 

include/wx/osx/carbon/region.h

@@ -57,7 +57,7 @@ protected:
     virtual bool DoUnionWithRect(const wxRect& rect);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxRegion)
+    wxDECLARE_DYNAMIC_CLASS(wxRegion);
     friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator;
 };
 
@@ -96,7 +96,7 @@ private:
     wxRegion m_region;
     wxRect*  m_rects;
 
-    DECLARE_DYNAMIC_CLASS(wxRegionIterator)
+    wxDECLARE_DYNAMIC_CLASS(wxRegionIterator);
 };
 
 #endif // _WX_MAC_CARBON_REGION_H_

include/wx/osx/carbon/statbmp.h

@@ -15,8 +15,8 @@
 
 class WXDLLIMPEXP_CORE wxStaticBitmap: public wxStaticBitmapBase
 {
-  DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
- public:
+  wxDECLARE_DYNAMIC_CLASS(wxStaticBitmap);
+public:
   wxStaticBitmap() { }
 
   wxStaticBitmap(wxWindow *parent, wxWindowID id,
@@ -57,7 +57,7 @@ class WXDLLIMPEXP_CORE wxStaticBitmap: public wxStaticBitmapBase
     virtual wxSize DoGetBestSize() const;
 
     wxBitmap m_bitmap;
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif

include/wx/osx/checkbox.h

@@ -42,7 +42,7 @@ protected:
     void DoSet3StateValue(wxCheckBoxState val);
     virtual wxCheckBoxState DoGet3StateValue() const;
 
-    DECLARE_DYNAMIC_CLASS(wxCheckBox)
+    wxDECLARE_DYNAMIC_CLASS(wxCheckBox);
 };
 
 class WXDLLIMPEXP_FWD_CORE wxBitmap;
@@ -76,7 +76,7 @@ public:
     virtual void SetLabel(const wxBitmap *bitmap);
     virtual void SetLabel( const wxString & WXUNUSED(name) ) {}
 
-    DECLARE_DYNAMIC_CLASS(wxBitmapCheckBox)
+    wxDECLARE_DYNAMIC_CLASS(wxBitmapCheckBox);
 };
 #endif
     // _WX_CHECKBOX_H_

include/wx/osx/checklst.h

@@ -86,8 +86,8 @@ protected:
     void Init();
 
 private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxCheckListBox)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxCheckListBox);
 };
 
 #endif // _WX_MAC_CHECKLST_H_

include/wx/osx/choice.h

@@ -21,7 +21,7 @@ WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
 // Choice item
 class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase
 {
-    DECLARE_DYNAMIC_CLASS(wxChoice)
+    wxDECLARE_DYNAMIC_CLASS(wxChoice);
 
 public:
     wxChoice()

include/wx/osx/clipbrd.h

@@ -59,7 +59,7 @@ private:
     bool              m_open;
     wxCFRef<PasteboardRef> m_pasteboard;
 
-    DECLARE_DYNAMIC_CLASS(wxClipboard)
+    wxDECLARE_DYNAMIC_CLASS(wxClipboard);
 };
 
 #endif // wxUSE_CLIPBOARD

include/wx/osx/cocoa/private.h

@@ -187,7 +187,7 @@ protected:
     // events, don't resend them
     bool m_hasEditor;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl);
 };
 
 DECLARE_WXCOCOA_OBJC_CLASS( wxNSWindow );
@@ -271,7 +271,7 @@ protected :
     CGWindowLevel   m_macWindowLevel;
     WXWindow        m_macWindow;
     void *          m_macFullScreenData ;
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl);
 };
 
 DECLARE_WXCOCOA_OBJC_CLASS( wxNSButton );

include/wx/osx/colordlg.h

@@ -20,7 +20,7 @@
 
 class WXDLLIMPEXP_CORE wxColourDialog: public wxDialog
 {
-DECLARE_DYNAMIC_CLASS(wxColourDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxColourDialog);
 public:
     wxColourDialog();
     wxColourDialog(wxWindow *parent, wxColourData *data = NULL);

include/wx/osx/combobox.h

@@ -33,7 +33,7 @@ class WXDLLIMPEXP_CORE wxComboBox :
 #endif
                 wxComboBoxBase>
 {
-    DECLARE_DYNAMIC_CLASS(wxComboBox)
+    wxDECLARE_DYNAMIC_CLASS(wxComboBox);
 
  public:
     virtual ~wxComboBox();

include/wx/osx/control.h

@@ -16,7 +16,7 @@ WXDLLIMPEXP_DATA_CORE(extern const char) wxControlNameStr[];
 // General item class
 class WXDLLIMPEXP_CORE wxControl : public wxControlBase
 {
-    DECLARE_ABSTRACT_CLASS(wxControl)
+    wxDECLARE_ABSTRACT_CLASS(wxControl);
 
 public:
    wxControl();

include/wx/osx/core/colour.h

@@ -80,7 +80,7 @@ private:
     ChannelType             m_green;
     ChannelType             m_alpha;
 
-    DECLARE_DYNAMIC_CLASS(wxColour)
+    wxDECLARE_DYNAMIC_CLASS(wxColour);
 };
 
 #endif

include/wx/osx/core/joystick.h

@@ -17,7 +17,7 @@ class WXDLLIMPEXP_FWD_CORE wxJoystickThread;
 
 class WXDLLIMPEXP_ADV wxJoystick: public wxObject
 {
-    DECLARE_DYNAMIC_CLASS(wxJoystick)
+    wxDECLARE_DYNAMIC_CLASS(wxJoystick);
  public:
 
     wxJoystick(int joystick = wxJOYSTICK1);

include/wx/osx/core/private.h

@@ -179,7 +179,7 @@ public :
 protected :
     wxMenuItem* m_peer;
 
-    DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)
+    wxDECLARE_ABSTRACT_CLASS(wxMenuItemImpl);
 } ;
 
 class wxMenuImpl : public wxObject
@@ -213,7 +213,7 @@ public :
 protected :
     wxMenu* m_peer;
 
-    DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)
+    wxDECLARE_ABSTRACT_CLASS(wxMenuItemImpl);
 } ;
 #endif
 
@@ -568,7 +568,7 @@ protected :
     bool                m_needsFrame;
     bool                m_shouldSendEvents;
 
-    DECLARE_ABSTRACT_CLASS(wxWidgetImpl)
+    wxDECLARE_ABSTRACT_CLASS(wxWidgetImpl);
 };
 
 //
@@ -913,7 +913,7 @@ public :
     virtual void RestoreWindowLevel() {}
 protected :
     wxNonOwnedWindow*   m_wxPeer;
-    DECLARE_ABSTRACT_CLASS(wxNonOwnedWindowImpl)
+    wxDECLARE_ABSTRACT_CLASS(wxNonOwnedWindowImpl);
 };
 
 #endif // wxUSE_GUI

include/wx/osx/cursor.h

@@ -44,7 +44,7 @@ private:
 
     void CreateFromImage(const wxImage & image) ;
 
-    DECLARE_DYNAMIC_CLASS(wxCursor)
+    wxDECLARE_DYNAMIC_CLASS(wxCursor);
 };
 
 extern WXDLLIMPEXP_CORE void wxSetCursor(const wxCursor& cursor);

include/wx/osx/dataview.h

@@ -302,9 +302,9 @@ private:
   wxDataViewModelNotifier* m_ModelNotifier; // stores the model notifier for the control (does not own the notifier)
 
  // wxWidget internal stuff:
-  DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
-  DECLARE_NO_COPY_CLASS(wxDataViewCtrl)
-  DECLARE_EVENT_TABLE()
+  wxDECLARE_DYNAMIC_CLASS(wxDataViewCtrl);
+  wxDECLARE_NO_COPY_CLASS(wxDataViewCtrl);
+  wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_DATAVIEWCTRL_OSX_H_

include/wx/osx/dcclient.h

@@ -36,7 +36,7 @@ protected:
     int m_width;
     int m_height;
 
-    DECLARE_CLASS(wxWindowDCImpl)
+    wxDECLARE_CLASS(wxWindowDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);
 };
 
@@ -49,7 +49,7 @@ public:
     virtual ~wxClientDCImpl();
 
 private:
-    DECLARE_CLASS(wxClientDCImpl)
+    wxDECLARE_CLASS(wxClientDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);
 };
 
@@ -62,7 +62,7 @@ public:
     virtual ~wxPaintDCImpl();
 
 protected:
-    DECLARE_CLASS(wxPaintDCImpl)
+    wxDECLARE_CLASS(wxPaintDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);
 };
 

include/wx/osx/dcmemory.h

@@ -37,7 +37,7 @@ private:
 
     wxBitmap  m_selected;
 
-    DECLARE_CLASS(wxMemoryDCImpl)
+    wxDECLARE_CLASS(wxMemoryDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
 };
 

include/wx/osx/dcprint.h

@@ -42,7 +42,7 @@ protected:
     wxNativePrinterDC* m_nativePrinterDC ;
 
 private:
-    DECLARE_CLASS(wxPrinterDC)
+    wxDECLARE_CLASS(wxPrinterDC);
 #endif // wxUSE_PRINTING_ARCHITECTURE
 };
 

include/wx/osx/dcscreen.h

@@ -25,7 +25,7 @@ private:
     void* m_overlayWindow;
 
 private:
-    DECLARE_CLASS(wxScreenDCImpl)
+    wxDECLARE_CLASS(wxScreenDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);
 };
 

include/wx/osx/dialog.h

@@ -19,7 +19,7 @@ class WXDLLIMPEXP_FWD_CORE wxModalEventLoop ;
 // Dialog boxes
 class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase
 {
-    DECLARE_DYNAMIC_CLASS(wxDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxDialog);
 
 public:
     wxDialog() { Init(); }

include/wx/osx/dirdlg.h

@@ -64,7 +64,7 @@ private:
     // Common part of all ctors.
     void Init();
 
-    DECLARE_DYNAMIC_CLASS(wxDirDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxDirDialog);
 };
 
 #endif // _WX_DIRDLG_H_

include/wx/osx/dvrenderer.h

@@ -104,7 +104,7 @@ private:
     // value that is going to be rendered
     wxVariant m_value;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer);
 };
 
 #endif // _WX_OSX_DVRENDERER_H_

include/wx/osx/dvrenderers.h

@@ -43,7 +43,7 @@ private:
 
     wxDC* m_DCPtr;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer);
 };
 
 // ---------------------------------------------------------
@@ -68,7 +68,7 @@ public:
 #endif // Cocoa
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer);
 };
 
 // ---------------------------------------------------------
@@ -87,7 +87,7 @@ public:
     virtual bool MacRender();
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer);
 };
 
 #if wxOSX_USE_COCOA
@@ -117,7 +117,7 @@ public:
 private:
     wxArrayString m_choices;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewChoiceRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewChoiceRenderer);
 };
 
 #endif // wxOSX_USE_COCOA
@@ -143,7 +143,7 @@ public:
 #endif // Cocoa
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer);
 };
 
 // ---------------------------------------------------------
@@ -168,7 +168,7 @@ public:
 #endif // Cocoa
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer);
 };
 
 // ---------------------------------------------------------
@@ -194,7 +194,7 @@ public:
 #endif // Cocoa
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer);
 };
 
 // ---------------------------------------------------------
@@ -219,7 +219,7 @@ public:
 #endif // Cocoa
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer);
 };
 
 #endif // _WX_OSX_DVRENDERERS_H_

include/wx/osx/filedlg.h

@@ -24,7 +24,7 @@ class WXDLLIMPEXP_FWD_CORE wxChoice;
 
 class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase
 {
-DECLARE_DYNAMIC_CLASS(wxFileDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxFileDialog);
 protected:
     wxArrayString m_fileNames;
     wxArrayString m_paths;

include/wx/osx/font.h

@@ -184,7 +184,7 @@ protected:
 
 private:
 
-    DECLARE_DYNAMIC_CLASS(wxFont)
+    wxDECLARE_DYNAMIC_CLASS(wxFont);
 };
 
 #endif // _WX_FONT_H_

include/wx/osx/fontdlg.h

@@ -47,7 +47,7 @@ public:
 protected:
     wxFontData m_fontData;
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxFontDialog)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxFontDialog);
 };
 
 extern "C" int RunMixedFontDialog(wxFontDialog* dialog) ;
@@ -87,10 +87,10 @@ class WXDLLIMPEXP_FWD_CORE wxCheckBox;
 
 class WXDLLIMPEXP_CORE wxFontDialog: public wxDialog
 {
-DECLARE_DYNAMIC_CLASS(wxFontDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxFontDialog);
 
 #if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
-DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 #endif
 
 public:

include/wx/osx/frame.h

@@ -108,8 +108,8 @@ protected:
 
     virtual bool        MacIsChildOfClientArea( const wxWindow* child ) const ;
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxFrame)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxFrame);
 };
 
 #endif

include/wx/osx/gauge.h

@@ -46,7 +46,7 @@ class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase
     void Pulse();
 
  protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge);
 };
 
 #endif

include/wx/osx/glcanvas.h

@@ -155,8 +155,8 @@ protected:
     GLint m_bufferName;
 #endif
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxGLCanvas)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_CLASS(wxGLCanvas);
 };
 
 #endif // _WX_GLCANVAS_H_

include/wx/osx/helpxxxx.h

@@ -18,7 +18,7 @@
 
 class WXDLLIMPEXP_CORE wxXXXXHelpController: public wxHelpControllerBase
 {
-  DECLARE_CLASS(wxXXXXHelpController)
+  wxDECLARE_CLASS(wxXXXXHelpController);
 
  public:
   wxXXXXHelpController();

include/wx/osx/icon.h

@@ -62,7 +62,7 @@ protected:
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxIcon)
+    wxDECLARE_DYNAMIC_CLASS(wxIcon);
 
     bool LoadIconFromSystemResource(const wxString& resourceName, int desiredWidth, int desiredHeight);
     bool LoadIconFromBundleResource(const wxString& resourceName, int desiredWidth, int desiredHeight);
@@ -93,7 +93,7 @@ public:
         { return LoadFile(bitmap, name, flags, -1, -1); }
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxICONResourceHandler)
+    wxDECLARE_DYNAMIC_CLASS(wxICONResourceHandler);
 };
 
 #endif

include/wx/osx/imaglist.h

@@ -53,7 +53,7 @@ private:
     int     m_width;
     int     m_height;
 
-    DECLARE_DYNAMIC_CLASS(wxImageList)
+    wxDECLARE_DYNAMIC_CLASS(wxImageList);
 };
 
 #endif  // _WX_IMAGLIST_H_

include/wx/osx/iphone/private.h

@@ -121,7 +121,7 @@ public :
     virtual void         controlTextDidChange();
 protected:
     WXWidget m_osxView;
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetIPhoneImpl)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetIPhoneImpl);
 };
 
 class wxNonOwnedWindowIPhoneImpl : public wxNonOwnedWindowImpl
@@ -189,7 +189,7 @@ protected :
     WX_UIWindow          m_macWindow;
     void *              m_macFullScreenData ;
     bool                m_initialShowSent;
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowIPhoneImpl)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowIPhoneImpl);
 };
 
 #ifdef __OBJC__

include/wx/osx/joystick.h

@@ -15,8 +15,8 @@
 
 class WXDLLIMPEXP_ADV wxJoystick: public wxObject
 {
-  DECLARE_DYNAMIC_CLASS(wxJoystick)
- public:
+  wxDECLARE_DYNAMIC_CLASS(wxJoystick);
+public:
   /*
    * Public interface
    */

include/wx/osx/listbox.h

@@ -172,8 +172,8 @@ private:
     friend class wxMacDataBrowserListControl;
 #endif // Carbon
 
-    DECLARE_DYNAMIC_CLASS(wxListBox)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxListBox);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_LISTBOX_H_

include/wx/osx/listctrl.h

@@ -24,8 +24,8 @@ WX_DECLARE_EXPORTED_LIST(wxListItem, wxColumnList);
 
 class WXDLLIMPEXP_CORE wxListCtrl: public wxListCtrlBase
 {
-  DECLARE_DYNAMIC_CLASS(wxListCtrl)
- public:
+    wxDECLARE_DYNAMIC_CLASS(wxListCtrl);
+public:
   /*
    * Public interface
    */

include/wx/osx/mdi.h

@@ -88,8 +88,8 @@ protected:
 private:
     friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
+    wxDECLARE_EVENT_TABLE();
+    wxDECLARE_DYNAMIC_CLASS(wxMDIParentFrame);
 };
 
 class WXDLLIMPEXP_CORE wxMDIChildFrame : public wxMDIChildFrameBase
@@ -132,7 +132,7 @@ protected:
     // common part of all ctors
     void Init();
 
-    DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
+    wxDECLARE_DYNAMIC_CLASS(wxMDIChildFrame);
 };
 
 class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxMDIClientWindowBase
@@ -147,7 +147,7 @@ public:
 protected:
     virtual void DoGetClientSize(int *width, int *height) const;
 
-    DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
+    wxDECLARE_DYNAMIC_CLASS(wxMDIClientWindow);
 };
 
 #endif // _WX_OSX_CARBON_MDI_H_

include/wx/osx/menu.h

@@ -91,7 +91,7 @@ private:
 
     wxMenuImpl* m_peer;
 
-    DECLARE_DYNAMIC_CLASS(wxMenu)
+    wxDECLARE_DYNAMIC_CLASS(wxMenu);
 };
 
 #if wxOSX_USE_COCOA_OR_CARBON
@@ -178,7 +178,7 @@ private:
     wxMenu* m_rootMenu;
     wxMenu* m_appleMenu;
 
-    DECLARE_DYNAMIC_CLASS(wxMenuBar)
+    wxDECLARE_DYNAMIC_CLASS(wxMenuBar);
 };
 
 #endif

include/wx/osx/menuitem.h

@@ -92,7 +92,7 @@ private:
 
     wxMenuItemImpl* m_peer;
 
-    DECLARE_DYNAMIC_CLASS(wxMenuItem)
+    wxDECLARE_DYNAMIC_CLASS(wxMenuItem);
 };
 
 #endif  //_MENUITEM_H

include/wx/osx/metafile.h

@@ -59,7 +59,7 @@ protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
-    DECLARE_DYNAMIC_CLASS(wxMetafile)
+    wxDECLARE_DYNAMIC_CLASS(wxMetafile);
 };
 
 
@@ -86,7 +86,7 @@ protected:
     wxMetafile*   m_metaFile;
 
 private:
-    DECLARE_CLASS(wxMetafileDCImpl)
+    wxDECLARE_CLASS(wxMetafileDCImpl);
     wxDECLARE_NO_COPY_CLASS(wxMetafileDCImpl);
 };
 
@@ -108,7 +108,7 @@ class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC
        { return ((wxMetafileDCImpl*)m_pimpl)->Close(); }
 
 private:
-    DECLARE_CLASS(wxMetafileDC)
+    wxDECLARE_CLASS(wxMetafileDC);
     wxDECLARE_NO_COPY_CLASS(wxMetafileDC);
 };
 

include/wx/osx/minifram.h

@@ -17,7 +17,7 @@
 
 class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame {
 
-  DECLARE_DYNAMIC_CLASS(wxMiniFrame)
+  wxDECLARE_DYNAMIC_CLASS(wxMiniFrame);
 
 public:
   inline wxMiniFrame() {}

include/wx/osx/msgdlg.h

@@ -48,7 +48,7 @@ protected:
 #if wxOSX_USE_COCOA
     WX_NSObject m_sheetDelegate;
 #endif
-    DECLARE_DYNAMIC_CLASS(wxMessageDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxMessageDialog);
 };
 
 #endif // _WX_MSGBOXDLG_H_

include/wx/osx/notebook.h

@@ -133,8 +133,8 @@ protected:
   // the icon indices
   wxArrayInt m_images;
 
-  DECLARE_DYNAMIC_CLASS(wxNotebook)
-  DECLARE_EVENT_TABLE()
+  wxDECLARE_DYNAMIC_CLASS(wxNotebook);
+  wxDECLARE_EVENT_TABLE();
 };
 
 

include/wx/osx/palette.h

@@ -34,7 +34,7 @@ protected:
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPalette)
+    wxDECLARE_DYNAMIC_CLASS(wxPalette);
 };
 
 #endif // _WX_PALETTE_H_

include/wx/osx/pen.h

@@ -68,7 +68,7 @@ protected:
 private:
     void Unshare();
 
-    DECLARE_DYNAMIC_CLASS(wxPen)
+    wxDECLARE_DYNAMIC_CLASS(wxPen);
 };
 
 #endif

include/wx/osx/pnghand.h

@@ -17,7 +17,7 @@
 
 class WXDLLIMPEXP_CORE wxPNGFileHandler: public wxBitmapHandler
 {
-  DECLARE_DYNAMIC_CLASS(wxPNGFileHandler)
+  wxDECLARE_DYNAMIC_CLASS(wxPNGFileHandler);
 public:
   inline wxPNGFileHandler(void)
   {

include/wx/osx/popupwin.h

@@ -28,7 +28,7 @@ public:
 
     virtual bool Show(bool show = true);
     
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow);
 };
 
 #endif // _WX_MAC_POPUPWIN_H_

include/wx/osx/printdlg.h

@@ -46,7 +46,7 @@ private:
     wxWindow*           m_dialogParent;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxPrintDialog)
+    wxDECLARE_DYNAMIC_CLASS(wxPrintDialog);
 };
 
 /*
@@ -70,7 +70,7 @@ private:
     wxWindow*               m_dialogParent;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageSetupDialog)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageSetupDialog);
 };
 
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
@@ -104,7 +104,7 @@ private:
     bool CheckValue(wxTextCtrl* textCtrl, int *value, int minValue, const wxString& name);
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageMarginsDialog)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageMarginsDialog);
 };
 
 

include/wx/osx/printmac.h

@@ -19,9 +19,9 @@
 
 class WXDLLIMPEXP_CORE wxMacPrinter: public wxPrinterBase
 {
-  DECLARE_DYNAMIC_CLASS(wxMacPrinter)
+    wxDECLARE_DYNAMIC_CLASS(wxMacPrinter);
 
- public:
+public:
     wxMacPrinter(wxPrintDialogData *data = NULL);
     virtual ~wxMacPrinter();
 
@@ -40,9 +40,9 @@ class WXDLLIMPEXP_CORE wxMacPrinter: public wxPrinterBase
 
 class WXDLLIMPEXP_CORE wxMacPrintPreview: public wxPrintPreviewBase
 {
-  DECLARE_CLASS(wxMacPrintPreview)
+    wxDECLARE_CLASS(wxMacPrintPreview);
 
- public:
+public:
     wxMacPrintPreview(wxPrintout *printout,
                           wxPrintout *printoutForPrinting = NULL,
                           wxPrintDialogData *data = NULL);

include/wx/osx/radiobox.h

@@ -18,7 +18,7 @@ class WXDLLIMPEXP_FWD_CORE wxRadioButton ;
 
 class WXDLLIMPEXP_CORE wxRadioBox: public wxControl, public wxRadioBoxBase
 {
-    DECLARE_DYNAMIC_CLASS(wxRadioBox)
+    wxDECLARE_DYNAMIC_CLASS(wxRadioBox);
 public:
 // Constructors & destructor
     wxRadioBox();
@@ -102,7 +102,7 @@ protected:
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif

include/wx/osx/radiobut.h

@@ -13,8 +13,8 @@
 
 class WXDLLIMPEXP_CORE wxRadioButton: public wxControl
 {
-  DECLARE_DYNAMIC_CLASS(wxRadioButton)
- protected:
+    wxDECLARE_DYNAMIC_CLASS(wxRadioButton);
+
 public:
     inline wxRadioButton() {}
     inline wxRadioButton(wxWindow *parent, wxWindowID id,
@@ -61,10 +61,10 @@ WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxBitmapRadioButtonNameStr[];
 
 class WXDLLIMPEXP_CORE wxBitmapRadioButton: public wxRadioButton
 {
-  DECLARE_DYNAMIC_CLASS(wxBitmapRadioButton)
- protected:
+  wxDECLARE_DYNAMIC_CLASS(wxBitmapRadioButton);
+protected:
   wxBitmap *theButtonBitmap;
- public:
+public:
   inline wxBitmapRadioButton() { theButtonBitmap = NULL; }
   inline wxBitmapRadioButton(wxWindow *parent, wxWindowID id,
            const wxBitmap *label,

include/wx/osx/scrolbar.h

@@ -61,8 +61,8 @@ protected:
     int m_viewSize;
     int m_objectSize;
 
-    DECLARE_DYNAMIC_CLASS(wxScrollBar)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxScrollBar);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_SCROLBAR_H_

include/wx/osx/slider.h

@@ -18,7 +18,7 @@
 // Slider
 class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase
 {
-    DECLARE_DYNAMIC_CLASS(wxSlider)
+    wxDECLARE_DYNAMIC_CLASS(wxSlider);
 
 public:
     wxSlider();
@@ -102,7 +102,7 @@ protected:
     int           m_lineSize;
     int           m_tickFreq;
 private :
-DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif

include/wx/osx/spinbutt.h

@@ -69,7 +69,7 @@ protected:
     virtual wxSize DoGetBestSize() const;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxSpinButton)
+    wxDECLARE_DYNAMIC_CLASS(wxSpinButton);
 };
 
 #endif

include/wx/osx/srchctrl.h

@@ -76,9 +76,9 @@ protected:
     wxString m_descriptiveText;
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxSearchCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxSearchCtrl);
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // wxUSE_SEARCHCTRL

include/wx/osx/statbox.h

@@ -16,9 +16,9 @@
 // Group box
 class WXDLLIMPEXP_CORE wxStaticBox: public wxControl
 {
-  DECLARE_DYNAMIC_CLASS(wxStaticBox)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticBox);
 
- public:
+public:
     inline wxStaticBox() {}
     inline wxStaticBox(wxWindow *parent, wxWindowID id,
            const wxString& label,

include/wx/osx/statline.h

@@ -49,7 +49,7 @@ protected:
     // we implement the static line using a static box
     wxStaticBox *m_statbox;
 
-    DECLARE_DYNAMIC_CLASS(wxStaticLine)
+    wxDECLARE_DYNAMIC_CLASS(wxStaticLine);
 };
 
 #endif // _WX_GENERIC_STATLINE_H_

include/wx/osx/stattext.h

@@ -50,7 +50,7 @@ protected :
     virtual bool DoSetLabelMarkup(const wxString& markup);
 #endif // wxUSE_MARKUP && wxOSX_USE_COCOA
 
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText);
 };
 
 #endif

include/wx/osx/statusbr.h

@@ -35,8 +35,8 @@ protected:
     virtual void DrawField(wxDC& dc, int i, int textHeight);
     virtual void DoUpdateStatusText(int number = 0);
 
-    DECLARE_DYNAMIC_CLASS(wxStatusBarMac)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS(wxStatusBarMac);
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_STATBAR_H_

include/wx/osx/taskbarosx.h

@@ -16,7 +16,7 @@ class WXDLLIMPEXP_FWD_CORE wxMenu;
 
 class WXDLLIMPEXP_ADV wxTaskBarIcon : public wxTaskBarIconBase
 {
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon);
 public:
     wxTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE);
     virtual ~wxTaskBarIcon();

include/wx/osx/textctrl.h

@@ -27,7 +27,7 @@
 
 class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase
 {
-  DECLARE_DYNAMIC_CLASS(wxTextCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxTextCtrl);
 
 public:
     wxTextCtrl()
@@ -148,7 +148,7 @@ protected:
 private :
     wxMenu  *m_privateContextMenu;
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_TEXTCTRL_H_

include/wx/osx/tglbtn.h

@@ -48,7 +48,7 @@ protected:
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton);
 };
 
 
@@ -78,7 +78,7 @@ public:
                 const wxString& name = wxCheckBoxNameStr);
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapToggleButton)
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapToggleButton);
 };
 
 #endif // _WX_TOGGLEBUTTON_H_

include/wx/osx/toolbar.h

@@ -18,8 +18,8 @@
 
 class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
 {
-  DECLARE_DYNAMIC_CLASS(wxToolBar)
- public:
+    wxDECLARE_DYNAMIC_CLASS(wxToolBar);
+public:
   /*
    * Public interface
    */
@@ -114,7 +114,7 @@ protected:
     virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
     virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 #if wxOSX_USE_NATIVE_TOOLBAR
     bool m_macUsesNativeToolbar ;
     void* m_macToolbar ;

include/wx/osx/tooltip.h

@@ -51,7 +51,7 @@ public:
 private:
     wxString  m_text;           // tooltip text
     wxWindow *m_window;         // window we're associated with
-    DECLARE_ABSTRACT_CLASS(wxToolTip)
+    wxDECLARE_ABSTRACT_CLASS(wxToolTip);
 };
 
 #endif // _WX_MAC_TOOLTIP_H_

include/wx/osx/toplevel.h

@@ -93,7 +93,7 @@ protected:
     // when it is called while the frame is hidden
     bool m_maximizeOnShow;
 private :
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_MSW_TOPLEVEL_H_

include/wx/osx/treectrl.h

@@ -61,7 +61,7 @@ enum {
 
 class WXDLLIMPEXP_CORE wxTreeItem: public wxObject
 {
-    DECLARE_DYNAMIC_CLASS(wxTreeItem)
+    wxDECLARE_DYNAMIC_CLASS(wxTreeItem);
 
 public:
 
@@ -208,7 +208,7 @@ protected:
     wxImageList* m_imageListNormal;
     wxImageList* m_imageListState;
 
-    DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
+    wxDECLARE_DYNAMIC_CLASS(wxTreeCtrl);
 };
 
 /*
@@ -230,7 +230,7 @@ protected:
 
 class WXDLLIMPEXP_CORE wxTreeEvent: public wxCommandEvent
 {
-    DECLARE_DYNAMIC_CLASS(wxTreeEvent)
+    wxDECLARE_DYNAMIC_CLASS(wxTreeEvent);
 
 public:
     wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0);

include/wx/osx/webview_webkit.h

@@ -149,7 +149,7 @@ public:
 protected:
     virtual void DoSetPage(const wxString& html, const wxString& baseUrl);
 
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
     void MacVisibilityChanged();
 
 private:

include/wx/osx/window.h

@@ -30,7 +30,7 @@ class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow;
 
 class WXDLLIMPEXP_CORE wxWindowMac: public wxWindowBase
 {
-    DECLARE_DYNAMIC_CLASS(wxWindowMac)
+    wxDECLARE_DYNAMIC_CLASS(wxWindowMac);
 
     friend class wxDC;
     friend class wxPaintDC;
@@ -397,7 +397,7 @@ private:
     void DoUpdateScrollbarVisibility();
 
     wxDECLARE_NO_COPY_CLASS(wxWindowMac);
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif // _WX_WINDOW_H_