From 777105f2b7f91a17fab7d9c4808e282547bb9393 Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Wed, 9 Feb 2005 15:01:49 +0000 Subject: [PATCH 1/1] ---------------------------------------------------------------------- Committing in . -delete superfluous semicolons -Update OpenVMS compile support Modified Files: wxWidgets/include/wx/gtk/region.h wxWidgets/include/wx/gtk/textctrl.h wxWidgets/include/wx/motif/icon.h wxWidgets/include/wx/x11/region.h wxWidgets/src/common/descrip.mms ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/region.h | 4 ++-- include/wx/gtk/textctrl.h | 2 +- include/wx/gtk1/region.h | 4 ++-- include/wx/gtk1/textctrl.h | 2 +- include/wx/motif/icon.h | 2 +- include/wx/x11/region.h | 4 ++-- src/common/descrip.mms | 5 +++-- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h index 5eec88fe82..40c7d60d42 100644 --- a/include/wx/gtk/region.h +++ b/include/wx/gtk/region.h @@ -155,7 +155,7 @@ protected: void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h); private: - DECLARE_DYNAMIC_CLASS(wxRegion); + DECLARE_DYNAMIC_CLASS(wxRegion) }; // ---------------------------------------------------------------------------- @@ -190,7 +190,7 @@ private: wxRegion m_region; private: - DECLARE_DYNAMIC_CLASS(wxRegionIterator); + DECLARE_DYNAMIC_CLASS(wxRegionIterator) }; diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h index a13d3270c3..4d71583c8d 100644 --- a/include/wx/gtk/textctrl.h +++ b/include/wx/gtk/textctrl.h @@ -227,7 +227,7 @@ private: #endif DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxTextCtrl); + DECLARE_DYNAMIC_CLASS(wxTextCtrl) }; #endif // __GTKTEXTCTRLH__ diff --git a/include/wx/gtk1/region.h b/include/wx/gtk1/region.h index 5eec88fe82..40c7d60d42 100644 --- a/include/wx/gtk1/region.h +++ b/include/wx/gtk1/region.h @@ -155,7 +155,7 @@ protected: void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h); private: - DECLARE_DYNAMIC_CLASS(wxRegion); + DECLARE_DYNAMIC_CLASS(wxRegion) }; // ---------------------------------------------------------------------------- @@ -190,7 +190,7 @@ private: wxRegion m_region; private: - DECLARE_DYNAMIC_CLASS(wxRegionIterator); + DECLARE_DYNAMIC_CLASS(wxRegionIterator) }; diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h index a13d3270c3..4d71583c8d 100644 --- a/include/wx/gtk1/textctrl.h +++ b/include/wx/gtk1/textctrl.h @@ -227,7 +227,7 @@ private: #endif DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxTextCtrl); + DECLARE_DYNAMIC_CLASS(wxTextCtrl) }; #endif // __GTKTEXTCTRLH__ diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h index eba9735f4d..e6d52926ea 100644 --- a/include/wx/motif/icon.h +++ b/include/wx/motif/icon.h @@ -63,7 +63,7 @@ public: { return !(*this == icon); } - DECLARE_DYNAMIC_CLASS(wxIcon); + DECLARE_DYNAMIC_CLASS(wxIcon) }; #endif // _WX_ICON_H_ diff --git a/include/wx/x11/region.h b/include/wx/x11/region.h index 6d25a33e0d..c9ff21e4b4 100644 --- a/include/wx/x11/region.h +++ b/include/wx/x11/region.h @@ -151,7 +151,7 @@ protected: void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h); private: - DECLARE_DYNAMIC_CLASS(wxRegion); + DECLARE_DYNAMIC_CLASS(wxRegion) }; // ---------------------------------------------------------------------------- @@ -186,7 +186,7 @@ private: wxRegion m_region; private: - DECLARE_DYNAMIC_CLASS(wxRegionIterator); + DECLARE_DYNAMIC_CLASS(wxRegionIterator) }; #endif diff --git a/src/common/descrip.mms b/src/common/descrip.mms index 6d6bc44b6f..7a95337183 100644 --- a/src/common/descrip.mms +++ b/src/common/descrip.mms @@ -48,6 +48,7 @@ OBJECTS = \ appcmn.obj,\ artprov.obj,\ artstd.obj,\ + bmpbase.obj,\ bookctrl.obj,\ choiccmn.obj,\ clipcmn.obj,\ @@ -175,9 +176,9 @@ OBJECTS2=utilscmn.obj,\ zipstrm.obj,\ zstream.obj -OBJECTS_MOTIF=bmpbase.obj,gaugecmn.obj +OBJECTS_MOTIF=gaugecmn.obj -OBJECTS_X11=accesscmn.obj,bmpbase.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\ +OBJECTS_X11=accesscmn.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\ dynload.obj,effects.obj,fddlgcmn.obj,fs_mem.obj,gaugecmn.obj,\ gbsizer.obj,geometry.obj,matrix.obj,radiocmn.obj,\ regex.obj,taskbarcmn.obj,xti.obj,xtistrm.obj,xtixml.obj -- 2.45.2