----------------------------------------------------------------------

 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

diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h
index 5eec88fe8222f64bd5808674f80ef360f3e0613e..40c7d60d4235f6d97de35c53acb3120b36a185ed 100644 (file)
--- 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:
     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:
     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 a13d3270c37df0105d2058e15ce92cd762db464a..4d71583c8de7af214750cee0327117f14d6e4f4b 100644 (file)
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -227,7 +227,7 @@ private:
 #endif
 
     DECLARE_EVENT_TABLE()
 #endif
 
     DECLARE_EVENT_TABLE()

-    DECLARE_DYNAMIC_CLASS(wxTextCtrl);
+    DECLARE_DYNAMIC_CLASS(wxTextCtrl)

 };
 
 #endif // __GTKTEXTCTRLH__
 };
 
 #endif // __GTKTEXTCTRLH__

diff --git a/include/wx/gtk1/region.h b/include/wx/gtk1/region.h
index 5eec88fe8222f64bd5808674f80ef360f3e0613e..40c7d60d4235f6d97de35c53acb3120b36a185ed 100644 (file)
--- 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:
     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:
     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 a13d3270c37df0105d2058e15ce92cd762db464a..4d71583c8de7af214750cee0327117f14d6e4f4b 100644 (file)
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -227,7 +227,7 @@ private:
 #endif
 
     DECLARE_EVENT_TABLE()
 #endif
 
     DECLARE_EVENT_TABLE()

-    DECLARE_DYNAMIC_CLASS(wxTextCtrl);
+    DECLARE_DYNAMIC_CLASS(wxTextCtrl)

 };
 
 #endif // __GTKTEXTCTRLH__
 };
 
 #endif // __GTKTEXTCTRLH__

diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h
index eba9735f4d6a570713b6b63fdaf45e40681b7faa..e6d52926ea5d41cd58a49af3aaaefa32db8a1314 100644 (file)
--- a/include/wx/motif/icon.h
+++ b/include/wx/motif/icon.h
@@ -63,7 +63,7 @@ public:
         { return !(*this == icon); }
 
 
         { return !(*this == icon); }
 
 

-    DECLARE_DYNAMIC_CLASS(wxIcon);
+    DECLARE_DYNAMIC_CLASS(wxIcon)

 };
 
 #endif // _WX_ICON_H_
 };
 
 #endif // _WX_ICON_H_

diff --git a/include/wx/x11/region.h b/include/wx/x11/region.h
index 6d25a33e0df0d2227f9b938aa4fe7779f095ecd5..c9ff21e4b459ba4f2244d6e34f61323fb4156539 100644 (file)
--- 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:
     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:
     wxRegion m_region;
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxRegionIterator);
+    DECLARE_DYNAMIC_CLASS(wxRegionIterator)

 };
 
 #endif
 };
 
 #endif

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 6d6bc44b6f8150592fbe22090c775af2af4e9f2b..7a95337183576294b534a6820f0218a4917f4e46 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -48,6 +48,7 @@ OBJECTS = \
                appcmn.obj,\
                artprov.obj,\
                artstd.obj,\
                appcmn.obj,\
                artprov.obj,\
                artstd.obj,\

+               bmpbase.obj,\

                bookctrl.obj,\
                choiccmn.obj,\
                clipcmn.obj,\
                bookctrl.obj,\
                choiccmn.obj,\
                clipcmn.obj,\


@@ -175,9 +176,9 @@ OBJECTS2=utilscmn.obj,\
                zipstrm.obj,\
                zstream.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
        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