Do not put semicolons after the definition of an inline function.

Even though most compilers just ignore this, it's just wrong and if you
do get warnings about header files, they can become quite overwhelming.
Forward port of r70163.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/cocoa/dc.h b/include/wx/cocoa/dc.h
index 31c565f26c9581f8270c954803a4433f51ff112b..65af01c0b2638de7c4e87d3d12f3180cd45d131d 100644 (file)
--- a/include/wx/cocoa/dc.h
+++ b/include/wx/cocoa/dc.h
@@ -80,10 +80,10 @@ public:
     virtual void Clear();
 
     virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; }
-    virtual void EndDoc(void) {};
+    virtual void EndDoc(void) {}
 
-    virtual void StartPage(void) {};
-    virtual void EndPage(void) {};
+    virtual void StartPage(void) {}
+    virtual void EndPage(void) {}
 
     virtual void SetFont(const wxFont& font);
     virtual void SetPen(const wxPen& pen);

diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index 831bed1c242f6b1ab302c7c7a8588dbfb1ea6020..a1a8a4386c802d7cf1d42fd521cbb8387166085d 100644 (file)
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -53,8 +53,8 @@ public:
     virtual int GetSelection() const = 0;
     virtual void GetSelection(long *from, long *to) const = 0;
 
-    virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); };
-    virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); };
+    virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); }
+    virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); }
 
     // may return value different from GetSelection() when the combobox
     // dropdown is shown and the user selected, but not yet accepted, a value

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 1252be4a4349d7d4994d581a636fc0e7be09f419..85d628841e4e7918094d2ff722f1410fd474df70 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -1210,7 +1210,7 @@ public:
     virtual bool HasDefaultCompare() const
         { return true; }
     virtual unsigned int GetColumnCount() const
-        { return 1; };
+        { return 1; }
     virtual wxString GetColumnType( unsigned int WXUNUSED(col) ) const
         { return wxT("wxDataViewIconText"); }
 

diff --git a/include/wx/generic/tabg.h b/include/wx/generic/tabg.h
index ad11457a9d88c42651c68bb5d3496f4e5f421641..a5975e5f8a84f4de095420dfb9006df85f5d39fc 100644 (file)
--- a/include/wx/generic/tabg.h
+++ b/include/wx/generic/tabg.h
@@ -130,7 +130,7 @@ public:
   // Called when a tab is activated
   virtual void OnTabActivate(int activateId, int deactivateId);
   // Allows vetoing
-  virtual bool OnTabPreActivate(int WXUNUSED(activateId), int WXUNUSED(deactivateId) ) { return true; };
+  virtual bool OnTabPreActivate(int WXUNUSED(activateId), int WXUNUSED(deactivateId) ) { return true; }
 
   // Allows use of application-supplied wxTabControl classes.
   virtual wxTabControl *OnCreateTabControl(void) { return new wxTabControl(this); }

diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h
index a581b4f46324653cf0b5f73fff55ec073e6c3cec..8e7de1f6e96385cde3d6119e8ca4a2dc32e2e839 100644 (file)
--- a/include/wx/glcanvas.h
+++ b/include/wx/glcanvas.h
@@ -143,7 +143,7 @@ public:
 
 #ifdef __WXUNIVERSAL__
     // resolve the conflict with wxWindowUniv::SetCurrent()
-    virtual bool SetCurrent(bool doit) { return wxWindow::SetCurrent(doit); };
+    virtual bool SetCurrent(bool doit) { return wxWindow::SetCurrent(doit); }
 #endif
 
 protected:

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 560dfa24d0cdd7a330802e0fa68e36ba67f7d475..a0ab0f283cc0ee6b2181d8a1526f57f16e9e2fc3 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -94,7 +94,7 @@ public:
 #if wxUSE_PALETTE
     wxPalette *GetPalette() const;
     void SetPalette(const wxPalette& palette);
-    wxPalette *GetColourMap() const { return GetPalette(); };
+    wxPalette *GetColourMap() const { return GetPalette(); }
 #endif // wxUSE_PALETTE
 
     static void InitStandardHandlers();

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index 2e067abc9580fd44d9b10887e478e842ccffd28e..1634fdbcd286fecea80f2f40e40d901f65fc46c2 100644 (file)
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -23,7 +23,7 @@ public:
     virtual ~wxGTKDCImpl();
 
 #if wxUSE_PALETTE
-    void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };
+    void SetColourMap( const wxPalette& palette ) { SetPalette(palette); }
 #endif // wxUSE_PALETTE
 
     // Resolution in pixels per logical inch

diff --git a/include/wx/gtk/filectrl.h b/include/wx/gtk/filectrl.h
index d5c3848e7680307547f06d61b34e6de70831e696..8147b79bc08c6a4bd94085074fb5c203913a32e0 100644 (file)
--- a/include/wx/gtk/filectrl.h
+++ b/include/wx/gtk/filectrl.h
@@ -88,7 +88,7 @@ public:
         Create( parent, id, defaultDirectory, defaultFilename, wildCard, style, pos, size, name );
     }
 
-    virtual ~wxGtkFileCtrl() {};
+    virtual ~wxGtkFileCtrl() {}
 
     void Init();
     bool Create( wxWindow *parent,

diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h
index b06d3bf7f87496b3d23cf14423c5b46e8573105f..728d6b77829bbf7c93549a3b1f5ba5d126369bf8 100644 (file)
--- a/include/wx/gtk/gauge.h
+++ b/include/wx/gtk/gauge.h
@@ -43,8 +43,8 @@ public:
 
     void SetShadowWidth( int WXUNUSED(w) ) { }
     void SetBezelFace( int WXUNUSED(w) ) { }
-    int GetShadowWidth() const { return 0; };
-    int GetBezelFace() const { return 0; };
+    int GetShadowWidth() const { return 0; }
+    int GetBezelFace() const { return 0; }
 
     // determinate mode API
     void SetRange( int r );

diff --git a/include/wx/gtk/private/timer.h b/include/wx/gtk/private/timer.h
index ada20184e08e346594f3af4c86fe2f40a5a0f4fc..f5b58dc9d880522a88f2a55fdf870fdfa467ed30 100644 (file)
--- a/include/wx/gtk/private/timer.h
+++ b/include/wx/gtk/private/timer.h
@@ -21,7 +21,7 @@
 class WXDLLIMPEXP_CORE wxGTKTimerImpl : public wxTimerImpl
 {
 public:
-    wxGTKTimerImpl(wxTimer* timer) : wxTimerImpl(timer) { m_sourceId = 0; };
+    wxGTKTimerImpl(wxTimer* timer) : wxTimerImpl(timer) { m_sourceId = 0; }
 
     virtual bool Start( int millisecs = -1, bool oneShot = false );
     virtual void Stop();

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index d7b19d6409bd1d0e4fd590cd31052192e3c814f1..f056ed31025f6af60e37eb99f768199f57b51d51 100644 (file)
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -55,7 +55,7 @@ public:
 
     virtual void ShowWithoutActivating();
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
-    virtual bool IsFullScreen() const { return m_fsIsShowing; };
+    virtual bool IsFullScreen() const { return m_fsIsShowing; }
 
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
 

diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index 14f94a6664c306bcec924337a2119d4df8af0fbb..444b5ab700ff85d9e82dc8cde2a2a3c49a69fa50 100644 (file)
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -105,7 +105,7 @@ public:
 #if wxUSE_PALETTE
     wxPalette *GetPalette() const;
     void SetPalette(const wxPalette& palette);
-    wxPalette *GetColourMap() const { return GetPalette(); };
+    wxPalette *GetColourMap() const { return GetPalette(); }
 #endif // wxUSE_PALETTE
 
     static void InitStandardHandlers();

diff --git a/include/wx/gtk1/dc.h b/include/wx/gtk1/dc.h
index b057e8512651f09785ca3b01abfc5a47916b43a8..939e74598d7dbbebdc37d6341bdd49d5d1eb787e 100644 (file)
--- a/include/wx/gtk1/dc.h
+++ b/include/wx/gtk1/dc.h
@@ -23,7 +23,7 @@ public:
     virtual ~wxGTKDCImpl() { }
 
 #if wxUSE_PALETTE
-    void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };
+    void SetColourMap( const wxPalette& palette ) { SetPalette(palette); }
 #endif // wxUSE_PALETTE
 
     // Resolution in pixels per logical inch

diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h
index 680e6690c4675303576d5a26c4f45757725047e1..41531b05d1766e54f78a1e388cd76541f1d3c6ae 100644 (file)
--- a/include/wx/gtk1/gauge.h
+++ b/include/wx/gtk1/gauge.h
@@ -45,8 +45,8 @@ public:
     void SetBezelFace( int WXUNUSED(w) ) { }
     void SetRange( int r );
     void SetValue( int pos );
-    int GetShadowWidth() const { return 0; };
-    int GetBezelFace() const { return 0; };
+    int GetShadowWidth() const { return 0; }
+    int GetBezelFace() const { return 0; }
     int GetRange() const;
     int GetValue() const;
 

diff --git a/include/wx/gtk1/msgdlg.h b/include/wx/gtk1/msgdlg.h
index e3436cb91219acbae697d198ebdaadfbd5d4e2f2..30734fd6b7347c1db0783f1f06374d035e7d8f29 100644 (file)
--- a/include/wx/gtk1/msgdlg.h
+++ b/include/wx/gtk1/msgdlg.h
@@ -30,7 +30,7 @@ public:
     virtual ~wxMessageDialog();
 
     int ShowModal();
-    virtual bool Show( bool WXUNUSED(show) = true ) { return false; };
+    virtual bool Show( bool WXUNUSED(show) = true ) { return false; }
 
 protected:
     // implement some base class methods to do nothing to avoid asserts and

diff --git a/include/wx/gtk1/toplevel.h b/include/wx/gtk1/toplevel.h
index 3a3042dc97ddf9d7506b4792c45281a67ba034ce..a534a1dc6668b76275b1f3d06ce51d3cba90f1fc 100644 (file)
--- a/include/wx/gtk1/toplevel.h
+++ b/include/wx/gtk1/toplevel.h
@@ -51,7 +51,7 @@ public:
     virtual void Restore();
 
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
-    virtual bool IsFullScreen() const { return m_fsIsShowing; };
+    virtual bool IsFullScreen() const { return m_fsIsShowing; }
 
     virtual bool SetShape(const wxRegion& region);
 

diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h
index 4be2ad16a214c8d0bfce53993435659f1a7b3244..2fd45ff5dfa7e099bc6db53777a97492950e93b5 100644 (file)
--- a/include/wx/html/webkit.h
+++ b/include/wx/html/webkit.h
@@ -32,7 +32,7 @@ class WXDLLIMPEXP_CORE wxWebKitCtrl : public wxControl
 public:
     DECLARE_DYNAMIC_CLASS(wxWebKitCtrl)
 
-    wxWebKitCtrl() {};
+    wxWebKitCtrl() {}
     wxWebKitCtrl(wxWindow *parent,
                     wxWindowID winID,
                     const wxString& strURL,
@@ -42,7 +42,7 @@ public:
                     const wxString& name = wxWebKitCtrlNameStr)
     {
         Create(parent, winID, strURL, pos, size, style, validator, name);
-    };
+    }
     bool Create(wxWindow *parent,
                 wxWindowID winID,
                 const wxString& strURL,

diff --git a/include/wx/list.h b/include/wx/list.h
index 02453b9fdc86bd8a20c4ab997d5b74e47ae708e8..2144dea9db8c68c848b166f7f376e249c1960616 100644 (file)
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -1198,7 +1198,7 @@ class WXDLLIMPEXP_BASE wxList : public wxObjectList
 {
 public:
 #if defined(wxWARN_COMPAT_LIST_USE) && !wxUSE_STD_CONTAINERS
-    wxList() { };
+    wxList() { }
     wxDEPRECATED( wxList(int key_type) );
 #elif !wxUSE_STD_CONTAINERS
     wxList(int key_type = wxKEY_NONE);

diff --git a/include/wx/mdi.h b/include/wx/mdi.h
index 6425de22536aeafd4bc9026714346494e38858cf..1f5d56e6474a3985632b7175c4bc711653fff87d 100644 (file)
--- a/include/wx/mdi.h
+++ b/include/wx/mdi.h
@@ -81,7 +81,7 @@ public:
 #if wxUSE_MENUS
     // return the pointer to the current window menu or NULL if we don't have
     // because of wxFRAME_NO_WINDOW_MENU style
-    wxMenu* GetWindowMenu() const { return m_windowMenu; };
+    wxMenu* GetWindowMenu() const { return m_windowMenu; }
 
     // use the given menu instead of the default window menu
     //

diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h
index 01a825a2c6031b49e9e2bd15fb026545d13a3351..66adbec41e608c84a3eb387de303565966d4c01b 100644 (file)
--- a/include/wx/motif/colour.h
+++ b/include/wx/motif/colour.h
@@ -38,8 +38,8 @@ public:
     unsigned char Green() const { return m_green; }
     unsigned char Blue() const { return m_blue; }
 
-    WXPixel GetPixel() const { return m_pixel; };
-    void SetPixel(WXPixel pixel) { m_pixel = pixel; m_isInit = true; };
+    WXPixel GetPixel() const { return m_pixel; }
+    void SetPixel(WXPixel pixel) { m_pixel = pixel; m_isInit = true; }
 
     inline bool operator == (const wxColour& colour) const { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); }
 

diff --git a/include/wx/motif/combobox.h b/include/wx/motif/combobox.h
index ddb9c1401c6ef87494908fbafde8b68dd85334e4..fdcb802d3116b46b3a550e9e01ad0dfd35f06424 100644 (file)
--- a/include/wx/motif/combobox.h
+++ b/include/wx/motif/combobox.h
@@ -106,8 +106,8 @@ public:
     WXWidget GetMainWidget() const { return m_mainWidget; }
 
    //Copied from wxComboBoxBase because for wxMOTIF wxComboBox does not inherit from it.
-    virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); };
-    virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); };
+    virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); }
+    virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); }
 
 protected:
     virtual wxSize DoGetBestSize() const;

diff --git a/include/wx/motif/dnd.h b/include/wx/motif/dnd.h
index ba22792fbfccfe9a6be09aa42264083818fd28bf..8d030c9b1dcc0b6eafafecb31736cfe93b04b66c 100644 (file)
--- a/include/wx/motif/dnd.h
+++ b/include/wx/motif/dnd.h
@@ -63,7 +63,7 @@ class WXDLLIMPEXP_CORE wxTextDropTarget: public wxDropTarget
 {
 public:
 
-    wxTextDropTarget() {};
+    wxTextDropTarget() {}
     virtual bool OnDrop( long x, long y, const void *data, size_t size );
     virtual bool OnDropText( long x, long y, const char *psz );
 
@@ -111,7 +111,7 @@ class WXDLLIMPEXP_CORE wxFileDropTarget: public wxDropTarget
 {
 public:
 
-    wxFileDropTarget() {};
+    wxFileDropTarget() {}
 
     virtual bool OnDrop( long x, long y, const void *data, size_t size );
     virtual bool OnDropFiles( long x, long y,
@@ -148,7 +148,7 @@ public:
     void SetData( wxDataObject &data  );
     wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
 
-    virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return true; };
+    virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return true; }
 
     // implementation
 #if 0

diff --git a/include/wx/motif/spinbutt.h b/include/wx/motif/spinbutt.h
index cd3e0c46ceeabedd992e4396272cf620a7edf252..4e53cb891b95b1e727723d3b9a7922c78a6d5971 100644 (file)
--- a/include/wx/motif/spinbutt.h
+++ b/include/wx/motif/spinbutt.h
@@ -53,7 +53,7 @@ public:
 
     // Implementation
     virtual void Command(wxCommandEvent& event)
-        { (void)ProcessCommand(event); };
+        { (void)ProcessCommand(event); }
     virtual void ChangeFont(bool keepOriginalSize = true);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();

diff --git a/include/wx/msw/private/timer.h b/include/wx/msw/private/timer.h
index 1e70cd387f59b352b90cf6e57ec6ef7d30c84da3..b22a3dc73b158abf4d0f22b41127d172fb44f3fb 100644 (file)
--- a/include/wx/msw/private/timer.h
+++ b/include/wx/msw/private/timer.h
@@ -19,7 +19,7 @@
 class WXDLLIMPEXP_BASE wxMSWTimerImpl : public wxTimerImpl
 {
 public:
-    wxMSWTimerImpl(wxTimer *timer) : wxTimerImpl(timer) { m_id = 0; };
+    wxMSWTimerImpl(wxTimer *timer) : wxTimerImpl(timer) { m_id = 0; }
 
     virtual bool Start(int milliseconds = -1, bool oneShot = false);
     virtual void Stop();

diff --git a/include/wx/msw/webview_ie.h b/include/wx/msw/webview_ie.h
index 690f3d3b92fa5d16da1a18e24e823035d522fd27..364d8670155440ee1516fd44a5cfffb9de72ca85 100644 (file)
--- a/include/wx/msw/webview_ie.h
+++ b/include/wx/msw/webview_ie.h
@@ -305,7 +305,7 @@ protected:
 
 public:
     VirtualProtocol(wxSharedPtr<wxWebViewHandler> handler);
-    ~VirtualProtocol() {};
+    ~VirtualProtocol() {}
 
     //IUnknown
     DECLARE_IUNKNOWN_METHODS;

diff --git a/include/wx/os2/checkbox.h b/include/wx/os2/checkbox.h
index b7d4c9bcfda9f6177994150ed295ebe23928c3ee..e03084b29bf9aef66d07a65945408617d132641e 100644 (file)
--- a/include/wx/os2/checkbox.h
+++ b/include/wx/os2/checkbox.h
@@ -110,7 +110,7 @@ class WXDLLIMPEXP_CORE wxBitmapCheckBox: public wxCheckBox
 private:
 
     virtual void SetLabel(const wxString& rsString)
-    { wxCheckBox::SetLabel(rsString); };
+    { wxCheckBox::SetLabel(rsString); }
     DECLARE_DYNAMIC_CLASS(wxBitmapCheckBox)
 };
 #endif

diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h
index e1d44c1c83e122224c8e9cba7c4210b8f3ce61e0..7fc1a01c816e6428f5703a4ebc66ec2481b553d5 100644 (file)
--- a/include/wx/os2/colour.h
+++ b/include/wx/os2/colour.h
@@ -49,7 +49,7 @@ public:
 
     bool operator != (const wxColour& rColour) const { return !(*this == rColour); }
 
-    WXCOLORREF GetPixel(void) const { return m_vPixel; };
+    WXCOLORREF GetPixel(void) const { return m_vPixel; }
 
 
 private:

diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h
index 0fc4ceeba5bb70f030183291e0c5e308182ae198..9825ad6b0cbf57892a1c9d7b0a1ac725d4726039 100644 (file)
--- a/include/wx/os2/control.h
+++ b/include/wx/os2/control.h
@@ -63,8 +63,8 @@ public:
     //
     // For ownerdraw items
     //
-    virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return false; };
-    virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return 0L; };
+    virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return false; }
+    virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return 0L; }
 
     wxArrayLong&     GetSubcontrols() { return m_aSubControls; }
     void             OnEraseBackground(wxEraseEvent& rEvent);

diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h
index c79181518bec5847dd69d54f0159ae81ff1c9fef..ed91205802a4b9dec84921d1d88e11955c146376 100644 (file)
--- a/include/wx/os2/frame.h
+++ b/include/wx/os2/frame.h
@@ -93,9 +93,9 @@ public:
 
     // TODO: should this go into a wxFrameworkSettings class perhaps?
     static void UseNativeStatusBar(bool bUseNative)
-        { m_bUseNativeStatusBar = bUseNative; };
+        { m_bUseNativeStatusBar = bUseNative; }
     static bool UsesNativeStatusBar()
-        { return m_bUseNativeStatusBar; };
+        { return m_bUseNativeStatusBar; }
 #endif // wxUSE_STATUSBAR
 
     WXHMENU GetWinMenu() const { return m_hMenu; }

diff --git a/include/wx/os2/gauge.h b/include/wx/os2/gauge.h
index f64df99fc7b664921555b656db78276057c1b043..083e9f13a7a0bb87740cda5c4d9ae1bf9d4a5c26 100644 (file)
--- a/include/wx/os2/gauge.h
+++ b/include/wx/os2/gauge.h
@@ -61,7 +61,7 @@ public:
     void SetValue(int nPos);
 
     inline virtual bool AcceptsFocus(void) const { return FALSE; }
-    inline virtual void Command(wxCommandEvent& WXUNUSED(rEvent)) {};
+    inline virtual void Command(wxCommandEvent& WXUNUSED(rEvent)) {}
 
 protected:
     int                             m_nRangeMax;

diff --git a/include/wx/os2/gdiimage.h b/include/wx/os2/gdiimage.h
index 293b9147cd665eb5138b49a9e7d919ce50e99022..aff5c708c19147b7813212b5a96aa14d30f24c85 100644 (file)
--- a/include/wx/os2/gdiimage.h
+++ b/include/wx/os2/gdiimage.h
@@ -54,7 +54,7 @@ public:
         { m_nWidth = nW; m_nHeight = nH; }
 
     // free the ressources we allocated
-    virtual void Free() { };
+    virtual void Free() { }
 
     // for compatibility, the member fields are public
 

diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h
index 4f2c392e99782b05b72904d7903e222a42f1c5be..83cef7afa1598a6ad3c9806be3f817f354ff3c07 100644 (file)
--- a/include/wx/os2/icon.h
+++ b/include/wx/os2/icon.h
@@ -25,7 +25,7 @@
 class WXDLLIMPEXP_CORE wxIconRefData: public wxIconRefDataBase
 {
 public:
-    wxIconRefData() { };
+    wxIconRefData() { }
     virtual ~wxIconRefData() { Free(); }
 
     virtual void Free();
@@ -70,7 +70,7 @@ public:
 
     inline void SetHICON(WXHICON hIcon) { SetHandle((WXHANDLE)hIcon); }
     inline WXHICON GetHICON() const { return (WXHICON)GetHandle(); }
-    inline bool    IsXpm(void) const { return m_bIsXpm; };
+    inline bool    IsXpm(void) const { return m_bIsXpm; }
     inline const wxBitmap& GetXpmSrc(void) const { return m_vXpmSrc; }
 
     void CopyFromBitmap(const wxBitmap& rBmp);

diff --git a/include/wx/os2/iniconf.h b/include/wx/os2/iniconf.h
index f3849403ff8e9762426bd3dea1121d63343225d0..07cb3ef0ff993348b2a3f976d69647e0bafc8cfc 100644 (file)
--- a/include/wx/os2/iniconf.h
+++ b/include/wx/os2/iniconf.h
@@ -107,15 +107,15 @@ private:
            m_strPath;     // the rest of the path (no trailing '_'!)
   // Virtual function hiding
   virtual bool Read(const wxString& key, bool* val) const
-  { return(wxConfigBase::Read(key, val));};
+  { return(wxConfigBase::Read(key, val));}
   virtual bool Read(const wxString& key, bool* val, bool defVal) const
-  { return(wxConfigBase::Read(key, val, defVal));};
+  { return(wxConfigBase::Read(key, val, defVal));}
   virtual bool Write(const wxString& key, double value)
-  { return(wxConfigBase::Write(key, value));};
+  { return(wxConfigBase::Write(key, value));}
   virtual bool Write(const wxString& key, bool value)
-  { return(wxConfigBase::Write(key, value));};
+  { return(wxConfigBase::Write(key, value));}
   virtual bool Write(const wxString& key, const char* value)
-  { return(wxConfigBase::Write(key, value));};
+  { return(wxConfigBase::Write(key, value));}
 };
 
 #endif  //_INICONF_H

diff --git a/include/wx/os2/joystick.h b/include/wx/os2/joystick.h
index e41369235524151e58012cfcbd59d1cc8bcca8de..1b348da46f7df8e1797a3df50ee1a4722a0c0a34 100644 (file)
--- a/include/wx/os2/joystick.h
+++ b/include/wx/os2/joystick.h
@@ -22,7 +22,7 @@ class WXDLLIMPEXP_ADV wxJoystick: public wxObject
    * Public interface
    */
 
-  wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; };
+  wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; }
 
   // Attributes
   ////////////////////////////////////////////////////////////////////////////

diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h
index 157c3c417a5a663689b44aca184319eb2f894e28..99b81113b55b57a016702fdb3c0b93ecffb1a4ac 100644 (file)
--- a/include/wx/os2/metafile.h
+++ b/include/wx/os2/metafile.h
@@ -172,7 +172,7 @@ class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObject
 {
 public:
     // ctors
-    wxMetafileDataObject() { m_width = 0; m_height = 0; };
+    wxMetafileDataObject() { m_width = 0; m_height = 0; }
     wxMetafileDataObject(const wxMetafile& metafile, int width = 0,int height = 0)
                         :m_metafile(metafile)
                         ,m_width(width)

diff --git a/include/wx/os2/pnghand.h b/include/wx/os2/pnghand.h
index b7b53ea184f7d190131f5d11ea9f8bc30e989437..0d78afc7a0a657ebf438928824371c2dda3e53f0 100644 (file)
--- a/include/wx/os2/pnghand.h
+++ b/include/wx/os2/pnghand.h
@@ -21,7 +21,7 @@ public:
         m_sName = "PNG bitmap file";
         m_sExtension = "bmp";
         m_lType = wxBITMAP_TYPE_PNG;
-    };
+    }
 
     virtual bool LoadFile( wxBitmap*       pBitmap
                           ,const wxString& rName

diff --git a/include/wx/os2/pngread.h b/include/wx/os2/pngread.h
index e66f475a3bf6e762287eafde451248b2ac77dc9f..6776c67f636e48ab9f32eac59eabafe278392dde 100644 (file)
--- a/include/wx/os2/pngread.h
+++ b/include/wx/os2/pngread.h
@@ -62,10 +62,10 @@ public:
   bool ReadFile( wxChar* ImageFileName=0 );
   bool SaveFile( wxChar* ImageFileName=0 );
   bool SaveXPM(wxChar *filename, wxChar *name = 0);
-  int  GetWidth( void ) const { return Width; };
-  int  GetHeight( void ) const { return Height; };
-  int  GetDepth( void ) const { return Depth; };
-  int  GetColorType( void ) const { return ColorType; };
+  int  GetWidth( void ) const { return Width; }
+  int  GetHeight( void ) const { return Height; }
+  int  GetDepth( void ) const { return Depth; }
+  int  GetColorType( void ) const { return ColorType; }
 
   int  GetIndex(int x, int y);
   bool GetRGB(int x, int y, byte* r, byte* g, byte* b);
@@ -285,4 +285,4 @@ inline bool wxPNGReaderIter::PrevStep()
 }
 
 #endif
-    // _WX_PNGREAD__
\ No newline at end of file
+    // _WX_PNGREAD__

diff --git a/include/wx/os2/radiobox.h b/include/wx/os2/radiobox.h
index 26c289b6a0f81d1a375e0c9d20b9b56035c53f3c..fda1b8ba18a461bda0b1367f0e5da7e26cec6b0e 100644 (file)
--- a/include/wx/os2/radiobox.h
+++ b/include/wx/os2/radiobox.h
@@ -150,7 +150,7 @@ public:
     inline         void     SetButtonFont(const wxFont& rFont) { SetFont(rFont); }
                    void     SetFocus(void);
            virtual bool     SetFont(const wxFont& rFont);
-    inline         void     SetLabelFont(const wxFont& WXUNUSED(font)) {};
+    inline         void     SetLabelFont(const wxFont& WXUNUSED(font)) {}
            virtual void     SetSelection(int nIndex);
            virtual void     SetString(unsigned int nNum, const wxString& rsLabel);
     virtual bool SetStringSelection(const wxString& rsStr);

diff --git a/include/wx/os2/sound.h b/include/wx/os2/sound.h
index f19bc3a712cc0de0a53737168c17f29907c7d973..b409029e8be8ade4d43e18f09d8d3cf5d3820ab7 100644 (file)
--- a/include/wx/os2/sound.h
+++ b/include/wx/os2/sound.h
@@ -29,7 +29,7 @@ public:
   // Create from data
   bool Create(size_t size, const void* data);
 
-  bool  IsOk() const { return (m_waveData ? TRUE : FALSE); };
+  bool  IsOk() const { return (m_waveData ? TRUE : FALSE); }
 
 protected:
   bool  Free();

diff --git a/include/wx/os2/statbmp.h b/include/wx/os2/statbmp.h
index 2fd6032e55a6b5dfa7ffef075f8456c24bd441b5..b8c10e29ddfe91934c1dcda068bc0a39ab40b93b 100644 (file)
--- a/include/wx/os2/statbmp.h
+++ b/include/wx/os2/statbmp.h
@@ -43,7 +43,7 @@ class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase
     inline virtual ~wxStaticBitmap() { Free(); }
 
     virtual void SetIcon(const wxIcon& rIcon) { SetImage(rIcon); }
-    virtual void SetBitmap(const wxBitmap& rBitmap) { SetImage(rBitmap); };
+    virtual void SetBitmap(const wxBitmap& rBitmap) { SetImage(rBitmap); }
 
     // assert failure is provoked by an attempt to get an icon from bitmap or
     // vice versa

diff --git a/include/wx/os2/treectrl.h b/include/wx/os2/treectrl.h
index 26d544ec9a56147e208b9e8cb2c4ce0130c754cd..4a1f678d2026ebbd0fc5b21b8de9c617792f84ec 100644 (file)
--- a/include/wx/os2/treectrl.h
+++ b/include/wx/os2/treectrl.h
@@ -586,7 +586,7 @@ private:
                          ,int                 nImage
                          ,int                 nImageSel
                         );
-    void DeleteTextCtrl() { };
+    void DeleteTextCtrl() { }
 
     //
     // support for additional item images which we implement using

diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h
index 168405f82fdb77c9e308cafa3b3cda95150d1ad1..bd6193b209facda0052df92e2cdec259bbdd3141 100644 (file)
--- a/include/wx/os2/window.h
+++ b/include/wx/os2/window.h
@@ -118,7 +118,7 @@ public:
                                  );
 
     inline HWND                   GetScrollBarHorz(void) const {return m_hWndScrollBarHorz;}
-    inline HWND                   GetScrollBarVert(void) const {return m_hWndScrollBarVert;};
+    inline HWND                   GetScrollBarVert(void) const {return m_hWndScrollBarVert;}
 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget(wxDropTarget* pDropTarget);
 #endif // wxUSE_DRAG_AND_DROP
@@ -182,7 +182,7 @@ public:
                                     );
 
     // PM 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; }
 
     // translate wxWidgets style flags for this control into the PM style
     // and optional extended style for the corresponding native control

diff --git a/include/wx/osx/carbon/statbmp.h b/include/wx/osx/carbon/statbmp.h
index f285535583e6622308b0a3c0c212af4370f6aee1..ce7066580ad78e36aea7c62d1d443884562a5e7d 100644 (file)
--- a/include/wx/osx/carbon/statbmp.h
+++ b/include/wx/osx/carbon/statbmp.h
@@ -39,8 +39,8 @@ class WXDLLIMPEXP_CORE wxStaticBitmap: public wxStaticBitmapBase
 
   virtual void SetBitmap(const wxBitmap& bitmap);
 
-  virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
-  virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
+  virtual void Command(wxCommandEvent& WXUNUSED(event)) {}
+  virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}
   void         OnPaint( wxPaintEvent &event ) ;
 
   wxBitmap GetBitmap() const { return m_bitmap; }

diff --git a/include/wx/osx/core/colour.h b/include/wx/osx/core/colour.h
index f5357bcb709a77df2bb006d88224e96a98a3ce78..cefae9a881dfc0b3006eeed9efe7bbfee4acf67e 100644 (file)
--- a/include/wx/osx/core/colour.h
+++ b/include/wx/osx/core/colour.h
@@ -42,10 +42,10 @@ public:
 
     bool operator != (const wxColour& colour) const { return !(*this == colour); }
 
-    CGColorRef GetPixel() const { return m_cgColour; };
+    CGColorRef GetPixel() const { return m_cgColour; }
 
-    CGColorRef GetCGColor() const { return m_cgColour; };
-    CGColorRef CreateCGColor() const { return wxCFRetain( (CGColorRef)m_cgColour ); };
+    CGColorRef GetCGColor() const { return m_cgColour; }
+    CGColorRef CreateCGColor() const { return wxCFRetain( (CGColorRef)m_cgColour ); }
 
 #if wxOSX_USE_COCOA_OR_CARBON
     void GetRGBColor( RGBColor *col ) const;

diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index 95fee216ea452459249467f70678758221efeb8d..e9d843020467424bc4fe78002035f937b354e5f5 100644 (file)
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -680,10 +680,10 @@ public :
 
     virtual ~wxComboWidgetImpl() {}
 
-    virtual int GetSelectedItem() const { return -1; };
-    virtual void SetSelectedItem(int WXUNUSED(item)) {};
+    virtual int GetSelectedItem() const { return -1; }
+    virtual void SetSelectedItem(int WXUNUSED(item)) {}
 
-    virtual int GetNumberOfItems() const { return -1; };
+    virtual int GetNumberOfItems() const { return -1; }
 
     virtual void InsertItem(int WXUNUSED(pos), const wxString& WXUNUSED(item)) {}
 

diff --git a/include/wx/osx/joystick.h b/include/wx/osx/joystick.h
index da1ba5bf3c00181c77cf6693c5068c80cd4acc4a..c0f4f5de4156c34a1b2073adc31dc4304f29277a 100644 (file)
--- a/include/wx/osx/joystick.h
+++ b/include/wx/osx/joystick.h
@@ -22,7 +22,7 @@ class WXDLLIMPEXP_ADV wxJoystick: public wxObject
    * Public interface
    */
 
-  wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; };
+  wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; }
 
   // Attributes
   ////////////////////////////////////////////////////////////////////////////

diff --git a/include/wx/osx/listctrl.h b/include/wx/osx/listctrl.h
index 46b876f3b4a27ff02892945541a6c7ced531eb9f..9f9f7f3f60acff1cc0ed78bdd008180b91b9967a 100644 (file)
--- a/include/wx/osx/listctrl.h
+++ b/include/wx/osx/listctrl.h
@@ -314,10 +314,10 @@ class WXDLLIMPEXP_CORE wxListCtrl: public wxControl
   bool Update(long item);
 */
 
-  void Command(wxCommandEvent& event) { ProcessCommand(event); };
+  void Command(wxCommandEvent& event) { ProcessCommand(event); }
 
-  wxListCtrlCompare GetCompareFunc() { return m_compareFunc; };
-  wxIntPtr GetCompareFuncData() { return m_compareFuncData; };
+  wxListCtrlCompare GetCompareFunc() { return m_compareFunc; }
+  wxIntPtr GetCompareFuncData() { return m_compareFuncData; }
 
 
   // public overrides needed for pimpl approach

diff --git a/include/wx/osx/metafile.h b/include/wx/osx/metafile.h
index 01f8734b08724b1aacc09780cffb6d3853f63df1..a670312675de41e6c8a9d3a78502ca4df51aab06 100644 (file)
--- a/include/wx/osx/metafile.h
+++ b/include/wx/osx/metafile.h
@@ -145,7 +145,7 @@ class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObjectSimple
 public:
   // ctors
   wxMetafileDataObject()
-    : wxDataObjectSimple(wxDF_METAFILE) {  };
+    : wxDataObjectSimple(wxDF_METAFILE) {  }
   wxMetafileDataObject(const wxMetafile& metafile)
     : wxDataObjectSimple(wxDF_METAFILE), m_metafile(metafile) { }
 

diff --git a/include/wx/osx/pnghand.h b/include/wx/osx/pnghand.h
index 6d31539e291172ab5e31c164558b8f6511ef4c1c..e1ffc9ed8911ff5c486bb7ece4b6bedfbad80c54 100644 (file)
--- a/include/wx/osx/pnghand.h
+++ b/include/wx/osx/pnghand.h
@@ -25,7 +25,7 @@ public:
     SetName(wxT("PNG bitmap file"));
     SetExtension(wxT("bmp"));
     SetType(wxBITMAP_TYPE_PNG);
-  };
+  }
 
   virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
       int desiredWidth, int desiredHeight);

diff --git a/include/wx/osx/pngread.h b/include/wx/osx/pngread.h
index 222a2c558921b571fa73582fb12a4334dfd993a5..bdf466b8a31853f71a914f956a7abc5c96f6e7cd 100644 (file)
--- a/include/wx/osx/pngread.h
+++ b/include/wx/osx/pngread.h
@@ -61,10 +61,10 @@ public:
   bool ReadFile( char* ImageFileName=0 );
   bool SaveFile( char* ImageFileName=0 );
   bool SaveXPM(char *filename, char *name = 0);
-  int  GetWidth( void ) const { return Width; };
-  int  GetHeight( void ) const { return Height; };
-  int  GetDepth( void ) const { return Depth; };
-  int  GetColorType( void ) const { return ColorType; };
+  int  GetWidth( void ) const { return Width; }
+  int  GetHeight( void ) const { return Height; }
+  int  GetDepth( void ) const { return Depth; }
+  int  GetColorType( void ) const { return ColorType; }
 
   int  GetIndex(int x, int y);
   bool GetRGB(int x, int y, byte* r, byte* g, byte* b);

diff --git a/include/wx/osx/statbox.h b/include/wx/osx/statbox.h
index ab105ea79ad57040b248b68e41250a986436a86a..7ba2b0c302359b85f6e216e22ef4f33e6cc147a8 100644 (file)
--- a/include/wx/osx/statbox.h
+++ b/include/wx/osx/statbox.h
@@ -38,8 +38,8 @@ class WXDLLIMPEXP_CORE wxStaticBox: public wxControl
            long style = 0,
            const wxString& name = wxStaticBoxNameStr);
 
-    virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
-    virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
+    virtual void Command(wxCommandEvent& WXUNUSED(event)) {}
+    virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}
 
     virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
 

diff --git a/include/wx/osx/treectrl.h b/include/wx/osx/treectrl.h
index 38844c7b65f3cbc9340fb6968b7c803ed7276199..acf069cb5f63fb9f5c60140301ce2f1968ff0039 100644 (file)
--- a/include/wx/osx/treectrl.h
+++ b/include/wx/osx/treectrl.h
@@ -225,7 +225,7 @@ public:
     bool SortChildren(long item);
     bool EnsureVisible(long item);
 
-    void Command(wxCommandEvent& event) { ProcessCommand(event); };
+    void Command(wxCommandEvent& event) { ProcessCommand(event); }
 
 protected:
     wxTextCtrl*  m_textCtrl;

diff --git a/include/wx/palmos/glcanvas.h b/include/wx/palmos/glcanvas.h
index e4e527552330a8be82fe1f84673e1826995f5fa8..976991951b6e58382ca1805f3bd12715f914436e 100644 (file)
--- a/include/wx/palmos/glcanvas.h
+++ b/include/wx/palmos/glcanvas.h
@@ -93,7 +93,7 @@ public:
     void SetCurrent();
 
 #ifdef __WXUNIVERSAL__
-    virtual bool SetCurrent(bool doit) { return wxWindow::SetCurrent(doit); };
+    virtual bool SetCurrent(bool doit) { return wxWindow::SetCurrent(doit); }
 #endif
 
     void SetColour(const wxChar *colour);

diff --git a/include/wx/palmos/mdi.h b/include/wx/palmos/mdi.h
index 97bd63b30fe2a8689f42f40a753def44216f3eda..91ca66810e5d29af9fd01d7bb110a249b81921d4 100644 (file)
--- a/include/wx/palmos/mdi.h
+++ b/include/wx/palmos/mdi.h
@@ -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) ;
 
     // MDI operations

diff --git a/include/wx/palmos/pen.h b/include/wx/palmos/pen.h
index 58eecece9ec94410a8b8746569cbe5c38fb98395..28095a27db27b79004660c663369a81350fdf61a 100644 (file)
--- a/include/wx/palmos/pen.h
+++ b/include/wx/palmos/pen.h
@@ -104,20 +104,20 @@ public:
     void SetJoin(wxPenJoin join);
     void SetCap(wxPenCap cap);
 
-    wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); };
-    int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); };
-    wxPenStyle GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); };
-    wxPenJoin GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); };
-    wxPenCap 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); }
+    wxPenStyle GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); }
+    wxPenJoin GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); }
+    wxPenCap GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); }
     int GetDashes(wxDash **ptr) const
     {
         *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : NULL);
         return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
     }
-    wxDash* GetDash() const { return (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : NULL); };
-    inline int GetDashCount() const { return (M_PENDATA ? M_PENDATA->m_nbDash : 0); };
+    wxDash* GetDash() const { return (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : NULL); }
+    inline int GetDashCount() const { return (M_PENDATA ? M_PENDATA->m_nbDash : 0); }
 
-    inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : NULL); };
+    inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : NULL); }
 
     // Internal
     bool RealizeResource();

diff --git a/include/wx/palmos/radiobox.h b/include/wx/palmos/radiobox.h
index d77fce4bfeccfdd126a6223408bbce4688124c57..26705a8c41e678b6b0dad3c289fab9322049ec88 100644 (file)
--- a/include/wx/palmos/radiobox.h
+++ b/include/wx/palmos/radiobox.h
@@ -120,7 +120,7 @@ public:
     virtual wxPoint GetClientAreaOrigin() const;
 
     void SetFocus();
-    void SetLabelFont(const wxFont& WXUNUSED(font)) {};
+    void SetLabelFont(const wxFont& WXUNUSED(font)) {}
     void SetButtonFont(const wxFont& font) { SetFont(font); }
 
     virtual void Refresh( bool eraseBackground = true,

diff --git a/include/wx/palmos/sound.h b/include/wx/palmos/sound.h
index 279e70687fd3bc3f833d5bba62bca35895b00c47..c76063757c8af15ad81dae2437b6ddac223afca9 100644 (file)
--- a/include/wx/palmos/sound.h
+++ b/include/wx/palmos/sound.h
@@ -30,7 +30,7 @@ public:
   // Create from data
   bool Create(size_t size, const void* data);
 
-  bool  IsOk() const { return (m_waveData ? true : false); };
+  bool  IsOk() const { return (m_waveData ? true : false); }
 
   static void Stop();
 

diff --git a/include/wx/palmos/window.h b/include/wx/palmos/window.h
index 4be644902d7c2c226086cc656f84f1fa19cc2e1c..99d7aa051462c8dabf7cf9f4a797001631e75239 100644 (file)
--- a/include/wx/palmos/window.h
+++ b/include/wx/palmos/window.h
@@ -139,7 +139,7 @@ public:
     wxWindow *FindItemByWinHandle(WXWINHANDLE handle, bool controlOnly = false) const;
 
     // Palm only: true if this control is part of the main control
-    virtual bool ContainsWinHandle(WXWINHANDLE WXUNUSED(handle)) const { return false; };
+    virtual bool ContainsWinHandle(WXWINHANDLE WXUNUSED(handle)) const { return false; }
 
     // translate wxWidgets style flags for this control into the Windows style
     // and optional extended style for the corresponding native control

diff --git a/include/wx/propgrid/property.h b/include/wx/propgrid/property.h
index cc5e30fe14089a860104379420c39abffb392df3..865f6c3846ca80dea6217e8f5af3707df447f294 100644 (file)
--- a/include/wx/propgrid/property.h
+++ b/include/wx/propgrid/property.h
@@ -966,7 +966,7 @@ public:
     }
 
     /** Gets a unsigned number identifying this list. */
-    wxPGChoicesId GetId() const { return (wxPGChoicesId) m_data; };
+    wxPGChoicesId GetId() const { return (wxPGChoicesId) m_data; }
 
     const wxString& GetLabel( unsigned int ind ) const
     {

diff --git a/include/wx/rawbmp.h b/include/wx/rawbmp.h
index ff353e39883470bebcd4178360d7e86b0a28895a..6e000ec1439b7dbf75836b00ff93840e0408a066 100644 (file)
--- a/include/wx/rawbmp.h
+++ b/include/wx/rawbmp.h
@@ -172,6 +172,11 @@ typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxImagePixelFormat;
     // Under GTK+ 2.X we use GdkPixbuf, which is standard RGB or RGBA
     typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat;
 
+    #define wxPIXEL_FORMAT_ALPHA 3
+#elif defined(__WXPM__)
+    // Under PM, we can use standard RGB or RGBA
+    typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat;
+
     #define wxPIXEL_FORMAT_ALPHA 3
 #elif defined(__WXDFB__)
     // Under DirectFB, RGB components are reversed, they're in BGR order

diff --git a/include/wx/richmsgdlg.h b/include/wx/richmsgdlg.h
index 06f6c4bea101a961c0fbae9f4ad02d611085296a..554a3691d01345f434df4dfddab9977995b910d8 100644 (file)
--- a/include/wx/richmsgdlg.h
+++ b/include/wx/richmsgdlg.h
@@ -45,7 +45,7 @@ public:
 
     wxString GetDetailedText() const { return m_detailedText; }
 
-    virtual bool IsCheckBoxChecked() const { return m_checkBoxValue; };
+    virtual bool IsCheckBoxChecked() const { return m_checkBoxValue; }
 
 protected:
     const wxString m_detailsExpanderCollapsedLabel;

diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h
index fdc2ea0f3a0b4f9344a112445897addf67240ce5..714098fc6937039e5574e734a96c3ab671d64bea 100644 (file)
--- a/include/wx/taskbar.h
+++ b/include/wx/taskbar.h
@@ -32,7 +32,7 @@ public:
 #if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__)
     static bool IsAvailable();
 #else
-    static bool IsAvailable() { return true; };
+    static bool IsAvailable() { return true; }
 #endif
 
     // Operations:

diff --git a/include/wx/univ/anybutton.h b/include/wx/univ/anybutton.h
index 6743fa44f20da55fb72d835d8d863a23547542fa..02670c02ae1e03cb736012cd41de0dc31732fd6a 100644 (file)
--- a/include/wx/univ/anybutton.h
+++ b/include/wx/univ/anybutton.h
@@ -20,7 +20,7 @@ class WXDLLIMPEXP_CORE wxAnyButton : public wxAnyButtonBase
 public:
     wxAnyButton() {}
 
-    virtual ~wxAnyButton() {};
+    virtual ~wxAnyButton() {}
 
 protected:
     // choose the default border for this window

diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h
index 8b5d956aca976a22e8e42b1b1bdb1c0faff036ce..4553382baba92f82576170abc26194416cda51dc 100644 (file)
--- a/include/wx/x11/bitmap.h
+++ b/include/wx/x11/bitmap.h
@@ -117,7 +117,7 @@ public:
 
     wxPalette *GetPalette() const;
     wxPalette *GetColourMap() const
-        { return GetPalette(); };
+        { return GetPalette(); }
     virtual void SetPalette(const wxPalette& palette);
 
     // implementation

diff --git a/include/wx/x11/dnd.h b/include/wx/x11/dnd.h
index 07d88e2a3e75c1aa58c990da2ab09615fcec067a..02cae89adb80e3f76b1d5b3c263160ceb2ecf1ca 100644 (file)
--- a/include/wx/x11/dnd.h
+++ b/include/wx/x11/dnd.h
@@ -63,7 +63,7 @@ class WXDLLIMPEXP_CORE wxTextDropTarget: public wxDropTarget
 {
 public:
 
-    wxTextDropTarget() {};
+    wxTextDropTarget() {}
     virtual bool OnDrop( long x, long y, const void *data, size_t size );
     virtual bool OnDropText( long x, long y, const char *psz );
 
@@ -111,7 +111,7 @@ class WXDLLIMPEXP_CORE wxFileDropTarget: public wxDropTarget
 {
 public:
 
-    wxFileDropTarget() {};
+    wxFileDropTarget() {}
 
     virtual bool OnDrop( long x, long y, const void *data, size_t size );
     virtual bool OnDropFiles( long x, long y,
@@ -148,7 +148,7 @@ public:
     void SetData( wxDataObject &data  );
     wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
 
-    virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; };
+    virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; }
 
     // implementation
 #if 0

diff --git a/include/wx/x11/joystick.h b/include/wx/x11/joystick.h
index bc7c583e6a54e4ff56332d0f2ce76a97ee8d1aac..c4af3eee3c29241db7062a723d655a8d2212bcca 100644 (file)
--- a/include/wx/x11/joystick.h
+++ b/include/wx/x11/joystick.h
@@ -22,7 +22,7 @@ public:
 * Public interface
     */
 
-    wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; };
+    wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; }
 
     // Attributes
     ////////////////////////////////////////////////////////////////////////////