Committing in .

 Modified Files:
 	wxWidgets/descrip.mms wxWidgets/setup.h_vms
                 OpenVMS build update
 	wxWidgets/include/wx/unix/glx11.h
                 Removed superfluous semi-colon
 	wxWidgets/samples/db/dbtest.cpp
 	wxWidgets/samples/db/listdb.cpp
                fixed wxString cast problems
 ----------------------------------------------------------------------

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

diff --git a/descrip.mms b/descrip.mms
index c2ed278f848d07e702459905ad2173f056e198e2..30f2d0c1f3d67cfbe5a4d3090ee234a1b933d1a8 100644 (file)
--- a/descrip.mms
+++ b/descrip.mms
@@ -2,7 +2,7 @@
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
 #                                                                            *
 # Make file for VMS                                                          *
 # Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *

-# Date : 19 September 2006                                                   *
+# Date : 19 April 2007                                                       *

 #                                                                            *
 #*****************************************************************************
 .first
 #                                                                            *
 #*****************************************************************************
 .first


@@ -15,7 +15,6 @@
 
 all :
        set default [.include.wx]
 
 all :
        set default [.include.wx]

-       if f$search("DEPRECATED.DIR") .eqs. "" then set file/enter=[]deprecated.dir [--.contrib.include.wx]deprecated.dir

        set default [--]
        make gtk
        purge [...]
        set default [--]
        make gtk
        purge [...]


@@ -33,23 +32,28 @@ all :
 gtk : [.include.wx]setup.h
        set default [.src.generic]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
 gtk : [.include.wx]setup.h
        set default [.src.generic]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)

+       library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj

        set default [-.common]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [-.common]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)

+       library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj

        set default [-.html]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [-.html]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)

+       library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj

        set default [-.xml]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [-.xml]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)

+       library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj

        set default [-.aui]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [-.xrc]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [-.aui]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [-.xrc]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)

+       library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj

        set default [-.unix]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [-.unix]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)

+       library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj

        set default [-.gtk1]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [-.gtk1]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)

-       set default [--.contrib.src.deprecated]
-       $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
-       set default [---.demos.bombs]
+       library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
+       set default [--.demos.bombs]

        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [--.samples.calendar]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
        set default [--.samples.calendar]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)


@@ -95,23 +99,28 @@ gtk2 : [.include.wx]setup.h
        @gnome$root:[000000]glib2
        set default [.src.generic]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
        @gnome$root:[000000]glib2
        set default [.src.generic]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)

+       library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj

        set default [-.common]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
        set default [-.common]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)

+       library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj

        set default [-.html]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
        set default [-.html]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)

+       library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj

        set default [-.aui]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
        set default [-.xml]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
        set default [-.aui]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
        set default [-.xml]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)

+       library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj

        set default [-.xrc]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
        set default [-.xrc]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)

+       library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj

        set default [-.unix]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
        set default [-.unix]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)

+       library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj

        set default [-.gtk]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
        set default [-.gtk]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)

-       set default [--.contrib.src.deprecated]
-       $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
-       set default [---.demos.bombs]
+       library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
+       set default [--.demos.bombs]

 #      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
        set default [--.samples.calendar]
 #      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
 #      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
        set default [--.samples.calendar]
 #      $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)


@@ -153,25 +162,31 @@ gtk2 : [.include.wx]setup.h
 x11 : [.include.wx]setup.h
        set default [.src.generic]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
 x11 : [.include.wx]setup.h
        set default [.src.generic]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)

+       library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj

        set default [-.common]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
        set default [-.common]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)

+       library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj

        set default [-.html]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
        set default [-.html]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)

+       library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj

        set default [-.xml]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
        set default [-.xml]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)

+       library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj

        set default [-.xrc]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
        set default [-.xrc]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)

+       library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj

        set default [-.aui]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
        set default [-.unix]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
        set default [-.aui]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
        set default [-.unix]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)

+       library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj

        set default [-.x11]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
        set default [-.x11]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)

+       library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj

        set default [-.univ]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
        set default [-.univ]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)

-       set default [--.contrib.src.deprecated]
-#      $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
-       set default [---.demos.bombs]
+       library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
+       set default [--.demos.bombs]

 #      $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
        set default [--.samples.calendar]
 #      $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
 #      $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
        set default [--.samples.calendar]
 #      $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)


@@ -212,19 +227,23 @@ x11 : [.include.wx]setup.h
 motif : [.include.wx]setup.h
        set default [.src.generic]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
 motif : [.include.wx]setup.h
        set default [.src.generic]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)

+       library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj

        set default [-.common]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
        set default [-.common]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)

+       library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj

        set default [-.unix]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
        set default [-.unix]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)

+       library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj

        set default [-.aui]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
        set default [-.aui]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)

+       library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj

        set default [-.motif]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
        set default [-.motif]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)

+       library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj

        set default [-.x11]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
        set default [-.x11]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)

-       set default [--.contrib.src.deprecated]
-       $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
-       set default [---.demos.bombs]
+       library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
+       set default [--.demos.bombs]

        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
        set default [--.samples.calendar]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
        set default [--.samples.calendar]
        $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)

diff --git a/include/wx/unix/glx11.h b/include/wx/unix/glx11.h
index d122db0a0c2a7ea924e91cb812c0a77416896c48..da982ca6c744a8840736653842d4c931f1ad1bab 100644 (file)
--- a/include/wx/unix/glx11.h
+++ b/include/wx/unix/glx11.h
@@ -155,7 +155,7 @@ public:
     }
 
 private:
     }
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxGLApp);
+    DECLARE_DYNAMIC_CLASS(wxGLApp)

 };
 
 #endif // _WX_UNIX_GLX11_H_
 };
 
 #endif // _WX_UNIX_GLX11_H_

diff --git a/samples/db/dbtest.cpp b/samples/db/dbtest.cpp
index 20fc064e0caf27da53525db6b588a4e4e137b7c7..6db33475af98d7e81163bed294fa4bf76bd0b927 100644 (file)
--- a/samples/db/dbtest.cpp
+++ b/samples/db/dbtest.cpp
@@ -1374,8 +1374,8 @@ void CeditorDlg::OnCommand(wxWindow& win, wxCommandEvent& WXUNUSED(event))
         // Display the query dialog box
         wxChar qryWhere[DB_MAX_WHERE_CLAUSE_LEN+1];
         wxStrcpy(qryWhere, (const wxChar*) wxGetApp().Contact->qryWhereStr);
         // Display the query dialog box
         wxChar qryWhere[DB_MAX_WHERE_CLAUSE_LEN+1];
         wxStrcpy(qryWhere, (const wxChar*) wxGetApp().Contact->qryWhereStr);

-        wxChar *tblName[] = {(wxChar *)CONTACT_TABLE_NAME.c_str(), 0};
-        new CqueryDlg(GetParent(), wxGetApp().Contact->GetDb(), tblName, qryWhere);
+        const wxChar *tblName[] = {(const wxChar *)CONTACT_TABLE_NAME.c_str(), 0};
+        new CqueryDlg(GetParent(), wxGetApp().Contact->GetDb(), (wxChar**) tblName, qryWhere);

 
         // Query the first record in the new record set and
         // display it, if the query string has changed.
 
         // Query the first record in the new record set and
         // display it, if the query string has changed.

diff --git a/samples/db/listdb.cpp b/samples/db/listdb.cpp
index 58bbaa84acb6532d1a917e1355c11b3dc2f151e1..07ced21b60f05854eac30836ba877deb35b9030a 100644 (file)
--- a/samples/db/listdb.cpp
+++ b/samples/db/listdb.cpp
@@ -362,7 +362,7 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, const wxString &windowTitle, const wxSt
     }
 
     // Query the actual record set
     }
 
     // Query the actual record set

-    if (selectStmt && wxStrlen(selectStmt))    // Query by sql stmt passed in
+    if ( (const char*) selectStmt && wxStrlen(selectStmt))    // Query by sql stmt passed in

     {
         if (!lookup2->QueryBySqlStmt(selectStmt))
         {
     {
         if (!lookup2->QueryBySqlStmt(selectStmt))
         {

diff --git a/setup.h_vms b/setup.h_vms
index 956b918ac0a2e4a7b65112ae2aea0fd3e59c8bb2..3986688c0098b845d8fc0d3bfc280676eb43b60e 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -3,7 +3,7 @@
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *

- * Date : 19 December 2006                                                   *
+ * Date : 17 April 2007                                                      *

  *                                                                           *
  *****************************************************************************/
 
  *                                                                           *
  *****************************************************************************/
 


@@ -328,6 +328,8 @@ typedef pid_t GPid;
 
 #define wxUSE_TIPWINDOW    1
 
 
 #define wxUSE_TIPWINDOW    1
 

+#define wxUSE_STC 1
+

 #define wxUSE_ANIMATIONCTRL 1
 #define wxUSE_BUTTON       1
 #define wxUSE_BMPBUTTON    1
 #define wxUSE_ANIMATIONCTRL 1
 #define wxUSE_BUTTON       1
 #define wxUSE_BMPBUTTON    1


@@ -587,6 +589,8 @@ typedef pid_t GPid;
 
 #define wxUSE_UNICODE_MSLU 0
 
 
 #define wxUSE_UNICODE_MSLU 0
 

+#define wxUSE_UNICODE_UTF8 0
+

 #define wxUSE_DC_CACHEING 1
 
 #define wxUSE_GADGETS 1
 #define wxUSE_DC_CACHEING 1
 
 #define wxUSE_GADGETS 1


@@ -990,9 +994,6 @@ typedef pid_t GPid;
 /* define if you have vsscanf function */
 #undef HAVE_VSSCANF
 
 /* define if you have vsscanf function */
 #undef HAVE_VSSCANF
 

-/* The number of bytes in a char.  */
-#define SIZEOF_CHAR 1
-

 /* The number of bytes in a wchar_t.  */
 #define SIZEOF_WCHAR_T 4
 
 /* The number of bytes in a wchar_t.  */
 #define SIZEOF_WCHAR_T 4