From: Jouk Jansen Date: Mon, 1 Sep 2003 14:47:00 +0000 (+0000) Subject: Committing in . X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1cc4f822d37f6546c5b00c341b2eecbaca5054b2 Committing in . Update OpenVMS compile support Modified Files: wxWindows/setup.h_vms wxWindows/src/common/descrip.mms wxWindows/src/generic/descrip.mms wxWindows/src/generic/notebook.cpp wxWindows/src/gtk/notebook.cpp wxWindows/src/univ/descrip.mms wxWindows/src/univ/notebook.cpp ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/setup.h_vms b/setup.h_vms index bdeb5af7fc..0530b8a7b4 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -210,6 +210,7 @@ * Use iODBC */ #define wxUSE_ODBC 1 +#define wxUSE_BUILTIN_IODBC 0 #define wxODBC_FWD_ONLY_CURSORS 1 #define wxODBC_BACKWARD_COMPATABILITY 0 /* @@ -532,17 +533,6 @@ */ #define wxUSE_TOOLBAR_NATIVE 1 -/* - * Use generic wxToolBar instead of/together with the native one? - */ -#define wxUSE_TOOLBAR_SIMPLE 1 - -#if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__) - #if wxUSE_TOOLBAR - #define wxUSE_BUTTONBAR 1 - #endif -#endif - /* * Use wxTreeLayout class */ @@ -820,10 +810,6 @@ */ #define wxUSE_APPLE_IEEE 0 -/* - * Compatibility with 2.0 API. - */ -#define WXWIN_COMPATIBILITY_2 1 /* * Compatibility with 2.2 API */ diff --git a/src/common/descrip.mms b/src/common/descrip.mms index 4d009eafbc..d1da2f9463 100644 --- a/src/common/descrip.mms +++ b/src/common/descrip.mms @@ -48,6 +48,7 @@ OBJECTS = \ appcmn.obj,\ artprov.obj,\ artstd.obj,\ + bookctrl.obj,\ choiccmn.obj,\ clipcmn.obj,\ clntdata.obj,\ @@ -179,6 +180,7 @@ SOURCES = \ artprov.cpp,\ artstd.cpp,\ bmpbase.cpp,\ + bookctrl.cpp,\ choiccmn.cpp,\ clipcmn.cpp,\ clntdata.cpp,\ @@ -330,6 +332,7 @@ appcmn.obj : appcmn.cpp artprov.obj : artprov.cpp artstd.obj : artstd.cpp bmpbase.obj : bmpbase.cpp +bookctrl.obj : bookctrl.cpp choiccmn.obj : choiccmn.cpp clipcmn.obj : clipcmn.cpp clntdata.obj : clntdata.cpp diff --git a/src/generic/descrip.mms b/src/generic/descrip.mms index afc647b7b5..03002afa2c 100644 --- a/src/generic/descrip.mms +++ b/src/generic/descrip.mms @@ -65,7 +65,6 @@ OBJECTS = \ sashwin.obj,\ selstore.obj,\ splitter.obj,\ - tbarsmpl.obj,\ tabg.obj,\ textdlgg.obj,\ tipdlg.obj,\ @@ -107,7 +106,6 @@ SOURCES = \ splitter.cpp,\ statline.cpp,\ statusbr.cpp,\ - tbarsmpl.cpp,\ tabg.cpp,\ textdlgg.cpp,\ tipdlg.cpp,\ @@ -174,7 +172,6 @@ selstore.obj : selstore.cpp splitter.obj : splitter.cpp statline.obj : statline.cpp statusbr.obj : statusbr.cpp -tbarsmpl.obj : tbarsmpl.cpp tabg.obj : tabg.cpp textdlgg.obj : textdlgg.cpp tipdlg.obj : tipdlg.cpp diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp index efd24ca31e..1c46df3568 100644 --- a/src/generic/notebook.cpp +++ b/src/generic/notebook.cpp @@ -20,6 +20,10 @@ #pragma implementation "notebook.h" #endif +#ifdef __VMS +#pragma message disable unscomzer +#endif + // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index eff2994167..248e2e2e05 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -614,10 +614,13 @@ bool wxNotebook::InsertPage( size_t position, gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate", GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win ); - if (position < 0) +#ifndef __VMS + // On VMS position is unsigned and thus always positive + if (position < 0) gtk_notebook_append_page( notebook, win->m_widget, nb_page->m_box ); else - gtk_notebook_insert_page( notebook, win->m_widget, nb_page->m_box, position ); +#endif + gtk_notebook_insert_page( notebook, win->m_widget, nb_page->m_box, position ); nb_page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data; @@ -654,10 +657,13 @@ bool wxNotebook::InsertPage( size_t position, gtk_widget_show( GTK_WIDGET(nb_page->m_label) ); if (select && (m_pagesData.GetCount() > 1)) { +#ifndef __VMS + // On VMS position is unsigned and thus always positive if (position < 0) SetSelection( GetPageCount()-1 ); else - SetSelection( position ); +#endif + SetSelection( position ); } gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index eff2994167..248e2e2e05 100644 --- a/src/gtk1/notebook.cpp +++ b/src/gtk1/notebook.cpp @@ -614,10 +614,13 @@ bool wxNotebook::InsertPage( size_t position, gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate", GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win ); - if (position < 0) +#ifndef __VMS + // On VMS position is unsigned and thus always positive + if (position < 0) gtk_notebook_append_page( notebook, win->m_widget, nb_page->m_box ); else - gtk_notebook_insert_page( notebook, win->m_widget, nb_page->m_box, position ); +#endif + gtk_notebook_insert_page( notebook, win->m_widget, nb_page->m_box, position ); nb_page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data; @@ -654,10 +657,13 @@ bool wxNotebook::InsertPage( size_t position, gtk_widget_show( GTK_WIDGET(nb_page->m_label) ); if (select && (m_pagesData.GetCount() > 1)) { +#ifndef __VMS + // On VMS position is unsigned and thus always positive if (position < 0) SetSelection( GetPageCount()-1 ); else - SetSelection( position ); +#endif + SetSelection( position ); } gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", diff --git a/src/univ/descrip.mms b/src/univ/descrip.mms index 15c8062486..d8509d6baf 100644 --- a/src/univ/descrip.mms +++ b/src/univ/descrip.mms @@ -40,7 +40,6 @@ OBJECTS = \ notebook.obj,\ radiobox.obj,\ radiobut.obj,\ - renderer.obj,\ scrarrow.obj,\ scrolbar.obj,\ scrthumb.obj,\ @@ -77,7 +76,6 @@ SOURCES =\ notebook.cpp \ radiobox.cpp \ radiobut.cpp \ - renderer.cpp \ scrarrow.cpp \ scrolbar.cpp \ scrthumb.cpp \ @@ -118,7 +116,6 @@ menu.obj : menu.cpp notebook.obj : notebook.cpp radiobox.obj : radiobox.cpp radiobut.obj : radiobut.cpp -renderer.obj : renderer.cpp scrarrow.obj : scrarrow.cpp scrolbar.obj : scrolbar.cpp scrthumb.obj : scrthumb.cpp diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp index 408034a35e..80763267ed 100644 --- a/src/univ/notebook.cpp +++ b/src/univ/notebook.cpp @@ -21,6 +21,10 @@ #pragma implementation "univnotebook.h" #endif +#ifdef __VMS +#pragma message disable unscomzer +#endif + #include "wx/wxprec.h" #ifdef __BORLANDC__