Committing in .

Modified Files:
 	wxWindows/setup.h_vms wxWindows/include/wx/caret.h
 	wxWindows/include/wx/dynlib.h wxWindows/include/wx/hash.h
 	wxWindows/include/wx/gtk/window.h
 	wxWindows/src/common/descrip.mms
 	wxWindows/src/generic/descrip.mms
 	wxWindows/src/unix/dialup.cpp

 -Removed some redundant ;'s from the .h files
 -Updated wxGTK for OpenVMS
 ----------------------------------------------------------------------


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

include/wx/caret.h

@@ -187,7 +187,7 @@ protected:
     int m_countVisible;
 
 private:
-    DECLARE_NO_COPY_CLASS(wxCaretBase);
+    DECLARE_NO_COPY_CLASS(wxCaretBase)
 };
 
 // ---------------------------------------------------------------------------

include/wx/dynlib.h

@@ -171,7 +171,7 @@ private:
 
     // no copy ctor/assignment operators (or we'd try to unload the library
     // twice)
-    DECLARE_NO_COPY_CLASS(wxDynamicLibrary);
+    DECLARE_NO_COPY_CLASS(wxDynamicLibrary)
 };
 
 // ----------------------------------------------------------------------------

include/wx/gtk/window.h

@@ -233,7 +233,7 @@ public:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowGTK)
-    DECLARE_NO_COPY_CLASS(wxWindowGTK);
+    DECLARE_NO_COPY_CLASS(wxWindowGTK)
 };
 
 extern wxWindow *wxFindFocusedChild(wxWindowGTK *win);

include/wx/gtk1/window.h

@@ -233,7 +233,7 @@ public:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowGTK)
-    DECLARE_NO_COPY_CLASS(wxWindowGTK);
+    DECLARE_NO_COPY_CLASS(wxWindowGTK)
 };
 
 extern wxWindow *wxFindFocusedChild(wxWindowGTK *win);

include/wx/hash.h

@@ -69,7 +69,7 @@ protected:
 
 private:
     // no copy ctor/assignment operator (yet)
-    DECLARE_NO_COPY_CLASS(wxHashTableBase);
+    DECLARE_NO_COPY_CLASS(wxHashTableBase)
 };
 
 // ----------------------------------------------------------------------------
@@ -106,7 +106,7 @@ private:
     size_t m_count;
 
     // not implemented yet
-    DECLARE_NO_COPY_CLASS(wxHashTableLong);
+    DECLARE_NO_COPY_CLASS(wxHashTableLong)
 };
 
 // ----------------------------------------------------------------------------
@@ -136,7 +136,7 @@ private:
     // the size of array above
     size_t m_hashSize;
 
-    DECLARE_NO_COPY_CLASS(wxStringHashTable);
+    DECLARE_NO_COPY_CLASS(wxStringHashTable)
 };
 
 // ----------------------------------------------------------------------------

setup.h_vms

@@ -198,11 +198,51 @@
  */
 #define wxUSE_VALIDATORS 1
 
+/*
+ * Use wxControl
+ */
+#define wxUSE_CONTROLS 1
+
+/*
+ * Use wxPopupWindow (useful in wxUniv only for now)
+ */
+#define wxUSE_POPUPWIN 1
+
 /*
  * Use accelerators
  */
 #define wxUSE_ACCEL 1
 
+/*
+ * Use wxCalendarCtrl
+ */
+#define wxUSE_CALENDARCTRL 1
+
+/*
+ * Use wxFileDialog
+ */
+#define wxUSE_FILEDLG 1
+
+/*
+ * Use wxFontDialog
+ */
+#define wxUSE_FONTDLG 1
+
+/*
+ * Use wxMimeTypesManager and related classes
+ */
+#define wxUSE_MIMETYPE 1
+
+/*
+ * Use wxMessageDialog (and wxMessageBox)
+ */
+#define wxUSE_MSGDLG 1
+
+/*
+ * Use wxNumberEntryDialog
+ */
+#define wxUSE_NUMBERDLG 1
+
 /*
  * Use wxTextEntryDialog
  */
@@ -218,11 +258,41 @@
  */
 #define wxUSE_PROGRESSDLG 1
 
+/*
+ * Use chooser dialog
+ */
+#define wxUSE_CHOICEDLG 1
+
+/*
+ * Use colour picker dialog
+ */
+#define wxUSE_COLOURDLG 1
+
 /*
  * Use directory chooser dialog
  */
 #define wxUSE_DIRDLG 1
 
+/*
+ * Use wxDragImage class
+ */
+#define wxUSE_DRAGIMAGE 1
+
+/*
+ * Use property sheet classes
+ */
+#define wxUSE_PROPSHEET 1
+
+/*
+ * Use wxWizard
+ */
+#define wxUSE_WIZARDDLG 1
+
+/*
+ * Use splash screen
+ */
+#define wxUSE_SPLASH 1
+
 /*
  * Joystick support (Linux/GTK only)
  */
@@ -232,6 +302,10 @@
  * Use this control
  */
 #define wxUSE_CARET 1
+/*
+ * Use this control
+ */
+#define wxUSE_BUTTON 1
 /*
  * Use this control
  */
@@ -281,6 +355,10 @@
  * Use wxPlot class
  */
  #define wxUSE_PLOT 1
+/*
+ * Use wxMenuBar, wxMenuItem and wxMenu
+ */
+#define wxUSE_MENUS 1
 /*
  * Use this control
  */
@@ -329,6 +407,10 @@
  * Use this control
  */
 #define wxUSE_STATLINE 1
+/*
+ * Use this control
+ */
+#define wxUSE_STATTEXT 1
 /*
  * Use this control
  */
@@ -344,7 +426,12 @@
 /* compatibility */
 #define wxUSE_TABDIALOG wxUSE_TAB_DIALOG
 /*
- * Use this control
+ * Use wxTextCtrl
+ */
+#define wxUSE_TEXTCTRL 1
+
+/*
+ * Use wxToollBar
  */
 #define wxUSE_TOOLBAR 1
 
@@ -380,6 +467,19 @@
  */
 #define wxUSE_GEOMETRY 1
 
+/*
+ * Use wxFFile class
+ */
+#define wxUSE_FFILE 1
+ 
+/*
+ * Use wxCmdLineParser class
+ */
+#define wxUSE_CMDLINE_PARSER 1
+/*
+ * Use wxDateTime
+ */
+#define wxUSE_DATETIME 1
 /*
  * Use wxFile class
  */
@@ -392,6 +492,18 @@
  * Use log classes and logging functions
  */
 #define wxUSE_LOG 1
+/*
+ * Use log window
+ */
+#define wxUSE_LOGWINDOW 1
+/*
+ * Use standard GUI logger
+ */
+#define wxUSE_LOGGUI 1
+/*
+ * Use wxStopWatch
+ */
+#define wxUSE_STOPWATCH 1
 /*
  * Use time and date classes
  */
@@ -404,6 +516,10 @@
  * Use config system
  */
 #define wxUSE_CONFIG 1
+/*
+ * Use font mapping/conversion classes
+ */
+#define wxUSE_FONTMAP 1
 /*
  * Use intl system
  */
@@ -423,7 +539,7 @@
 /*
  * Use dialup manager
  */
-#define wxUSE_DIALUP_MANAGER 0
+#define wxUSE_DIALUP_MANAGER 1
 /*
  * Use standard C++ streams if 1. If 0, use wxWin
  * streams implementation.
@@ -434,6 +550,11 @@
  */
 #define wxUSE_DYNLIB_CLASS 1
 
+/*
+ * Use wxTimer
+ */
+#define wxUSE_TIMER 1
+
 /*
  * Use font metric files in GetTextExtent for wxPostScriptDC
  * Use consistent PostScript fonts for AFM and printing (!)
@@ -487,10 +608,14 @@
  * Use clipboard
  */
 #define wxUSE_CLIPBOARD 1
+/*
+ * Use wxDataObject
+*/
+#define wxUSE_DATAOBJ 1
 /*
  * Use tooltips
  */
-#define wxUSE_TOOLTIPS 0
+#define wxUSE_TOOLTIPS 1
 /*
  * Use dnd
  */
@@ -537,6 +662,11 @@
  * Use wxWindows help facility (needs wxUSE_IPC 1)
  */
 #define wxUSE_HELP 1
+/*
+ * Use built-in HTML-based help controller
+ */
+#define wxUSE_WXHTML_HELP 1
+
 /*
  * Use iostream.h rather than iostream
  */
@@ -545,10 +675,15 @@
  * Use Apple Ieee-double converter
  */
 #define wxUSE_APPLE_IEEE 0
+
 /*
  * Compatibility with 2.0 API.
  */
-#define WXWIN_COMPATIBILITY_2 1
+#define WXWIN_COMPATIBILITY_2 0
+/*
+ * Compatibility with 2.2 API
+ */
+#define WXWIN_COMPATIBILITY_2_2 1
 /*
  * Enables debugging: memory tracing, assert, etc., contains debug level
  */
@@ -762,6 +897,12 @@
 /* The number of bytes in a short.  */
 #define SIZEOF_SHORT 2
 
+/* Define if size_t on your machine is the same type as unsigned int. */
+#define wxSIZE_T_IS_UINT  1
+
+/* Define if size_t on your machine is the same type as unsigned long. */
+#undef wxSIZE_T_IS_ULONG
+
 /* Define if you have the dlopen function.  */
 #define HAVE_DLOPEN 1
 
@@ -834,4 +975,7 @@
 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM
 
+/* now check the settings self consistency */
+#include "wx/chkconf.h"
+
 #endif /* __WX_SETUP_H__ */

src/common/descrip.mms

@@ -102,6 +102,7 @@ OBJECTS1=framecmn.obj,\
 		mimecmn.obj,\
 		module.obj,\
 		mstream.obj,\
+		nbkbase.obj,\
 		object.obj,\
 		objstrm.obj,\
 		paper.obj,\
@@ -205,6 +206,7 @@ SOURCES = \
 		mimecmn.cpp,\
 		module.cpp,\
 		mstream.cpp,\
+		nbkbase.cpp,\
 		object.cpp,\
 		objstrm.cpp,\
 		paper.cpp,\
@@ -338,6 +340,7 @@ menucmn.obj : menucmn.cpp
 mimecmn.obj : mimecmn.cpp
 module.obj : module.cpp
 mstream.obj : mstream.cpp
+nbkbase.obj : nbkbase.cpp
 object.obj : object.cpp
 objstrm.obj : objstrm.cpp
 paper.obj : paper.cpp

src/generic/descrip.mms

@@ -31,6 +31,7 @@ CC_DEFINE =
 	cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
 OBJECTS = \
+		accel.obj,\
 		busyinfo.obj,\
 		calctrl.obj,\
 		caret.obj,\
@@ -59,7 +60,6 @@ OBJECTS = \
 		propform.obj,\
 		proplist.obj,\
 		sashwin.obj,\
-		scrolwin.obj,\
 		splitter.obj,\
 		statusbr.obj,\
 		tbarsmpl.obj,\
@@ -71,6 +71,7 @@ OBJECTS = \
 		wizard.obj
 
 SOURCES = \
+		accel.cpp,\
 		busyinfo.cpp,\
 		calctrl.cpp,\
 		caret.cpp,\
@@ -102,7 +103,6 @@ SOURCES = \
 		propform.cpp,\
 		proplist.cpp,\
 		sashwin.cpp,\
-		scrolwin.cpp,\
 		splitter.cpp,\
 		statline.cpp,\
 		statusbr.cpp,\
@@ -131,6 +131,7 @@ all : $(SOURCES)
 .endif
 .endif
 
+accel.obj : accel.cpp
 busyinfo.obj : busyinfo.cpp
 calctrl.obj : calctrl.cpp
 caret.obj : caret.cpp
@@ -162,7 +163,6 @@ prop.obj : prop.cpp
 propform.obj : propform.cpp
 proplist.obj : proplist.cpp
 sashwin.obj : sashwin.cpp
-scrolwin.obj : scrolwin.cpp
 splitter.obj : splitter.cpp
 statline.obj : statline.cpp
 statusbr.obj : statusbr.cpp

src/unix/dialup.cpp

@@ -639,7 +639,11 @@ wxDialUpManagerImpl::CheckProcNet()
 int
 wxDialUpManagerImpl::CheckIfconfig()
 {
-    // assume that the test doesn't work
+#ifdef __VMS
+       m_CanUseIfconfig = 0;
+        return -1;
+#else
+   // assume that the test doesn't work
     int netDevice = NetDevice_Unknown;
 
     // first time check for ifconfig location
@@ -687,11 +691,11 @@ wxDialUpManagerImpl::CheckIfconfig()
         // VZ: a wild guess (but without it, ifconfig fails completely)
         cmd << _T(" ppp0");
 #else
-#     pragma warning "No ifconfig information for this OS."
+# pragma warning "No ifconfig information for this OS."
-        m_CanUseIfconfig = 0;
+       m_CanUseIfconfig = 0;
         return -1;
 #endif
-        cmd << " >" << tmpfile <<  '\'';
+       cmd << " >" << tmpfile <<  '\'';
         /* I tried to add an option to wxExecute() to not close stdout,
            so we could let ifconfig write directly to the tmpfile, but
            this does not work. That should be faster, as it doesn´t call
@@ -745,6 +749,7 @@ wxDialUpManagerImpl::CheckIfconfig()
     }
 
     return netDevice;
+#endif
 }
 
 wxDialUpManagerImpl::NetConnection wxDialUpManagerImpl::CheckPing()
@@ -753,10 +758,15 @@ wxDialUpManagerImpl::NetConnection wxDialUpManagerImpl::CheckPing()
    // which does not take arguments, a la GNU.
    if(m_CanUsePing == -1) // unknown
    {
+#ifdef __VMS
+      if(wxFileExists("SYS$SYSTEM:TCPIP$PING.EXE"))
+         m_PingPath = "$SYS$SYSTEM:TCPIP$PING";
+#else
       if(wxFileExists("/bin/ping"))
          m_PingPath = "/bin/ping";
       else if(wxFileExists("/usr/sbin/ping"))
          m_PingPath = "/usr/sbin/ping";
+#endif
       if(! m_PingPath)
       {
          m_CanUsePing = 0;
@@ -775,7 +785,7 @@ wxDialUpManagerImpl::NetConnection wxDialUpManagerImpl::CheckPing()
    cmd << m_PingPath << ' ';
 #if defined(__SOLARIS__) || defined (__SUNOS__)
    // nothing to add to ping command
-#elif defined(__LINUX__) || defined ( __FREEBSD__) || defined(__WXMAC__)
+#elif defined(__LINUX__) || defined ( __FREEBSD__) || defined(__WXMAC__) || defined( __VMS )
    cmd << "-c 1 "; // only ping once
 #elif defined(__HPUX__)
    cmd << "64 1 "; // only ping once (need also specify the packet size)