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
This commit is contained in:
16
setup.h_vms
16
setup.h_vms
@@ -210,6 +210,7 @@
|
|||||||
* Use iODBC
|
* Use iODBC
|
||||||
*/
|
*/
|
||||||
#define wxUSE_ODBC 1
|
#define wxUSE_ODBC 1
|
||||||
|
#define wxUSE_BUILTIN_IODBC 0
|
||||||
#define wxODBC_FWD_ONLY_CURSORS 1
|
#define wxODBC_FWD_ONLY_CURSORS 1
|
||||||
#define wxODBC_BACKWARD_COMPATABILITY 0
|
#define wxODBC_BACKWARD_COMPATABILITY 0
|
||||||
/*
|
/*
|
||||||
@@ -532,17 +533,6 @@
|
|||||||
*/
|
*/
|
||||||
#define wxUSE_TOOLBAR_NATIVE 1
|
#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
|
* Use wxTreeLayout class
|
||||||
*/
|
*/
|
||||||
@@ -820,10 +810,6 @@
|
|||||||
*/
|
*/
|
||||||
#define wxUSE_APPLE_IEEE 0
|
#define wxUSE_APPLE_IEEE 0
|
||||||
|
|
||||||
/*
|
|
||||||
* Compatibility with 2.0 API.
|
|
||||||
*/
|
|
||||||
#define WXWIN_COMPATIBILITY_2 1
|
|
||||||
/*
|
/*
|
||||||
* Compatibility with 2.2 API
|
* Compatibility with 2.2 API
|
||||||
*/
|
*/
|
||||||
|
@@ -48,6 +48,7 @@ OBJECTS = \
|
|||||||
appcmn.obj,\
|
appcmn.obj,\
|
||||||
artprov.obj,\
|
artprov.obj,\
|
||||||
artstd.obj,\
|
artstd.obj,\
|
||||||
|
bookctrl.obj,\
|
||||||
choiccmn.obj,\
|
choiccmn.obj,\
|
||||||
clipcmn.obj,\
|
clipcmn.obj,\
|
||||||
clntdata.obj,\
|
clntdata.obj,\
|
||||||
@@ -179,6 +180,7 @@ SOURCES = \
|
|||||||
artprov.cpp,\
|
artprov.cpp,\
|
||||||
artstd.cpp,\
|
artstd.cpp,\
|
||||||
bmpbase.cpp,\
|
bmpbase.cpp,\
|
||||||
|
bookctrl.cpp,\
|
||||||
choiccmn.cpp,\
|
choiccmn.cpp,\
|
||||||
clipcmn.cpp,\
|
clipcmn.cpp,\
|
||||||
clntdata.cpp,\
|
clntdata.cpp,\
|
||||||
@@ -330,6 +332,7 @@ appcmn.obj : appcmn.cpp
|
|||||||
artprov.obj : artprov.cpp
|
artprov.obj : artprov.cpp
|
||||||
artstd.obj : artstd.cpp
|
artstd.obj : artstd.cpp
|
||||||
bmpbase.obj : bmpbase.cpp
|
bmpbase.obj : bmpbase.cpp
|
||||||
|
bookctrl.obj : bookctrl.cpp
|
||||||
choiccmn.obj : choiccmn.cpp
|
choiccmn.obj : choiccmn.cpp
|
||||||
clipcmn.obj : clipcmn.cpp
|
clipcmn.obj : clipcmn.cpp
|
||||||
clntdata.obj : clntdata.cpp
|
clntdata.obj : clntdata.cpp
|
||||||
|
@@ -65,7 +65,6 @@ OBJECTS = \
|
|||||||
sashwin.obj,\
|
sashwin.obj,\
|
||||||
selstore.obj,\
|
selstore.obj,\
|
||||||
splitter.obj,\
|
splitter.obj,\
|
||||||
tbarsmpl.obj,\
|
|
||||||
tabg.obj,\
|
tabg.obj,\
|
||||||
textdlgg.obj,\
|
textdlgg.obj,\
|
||||||
tipdlg.obj,\
|
tipdlg.obj,\
|
||||||
@@ -107,7 +106,6 @@ SOURCES = \
|
|||||||
splitter.cpp,\
|
splitter.cpp,\
|
||||||
statline.cpp,\
|
statline.cpp,\
|
||||||
statusbr.cpp,\
|
statusbr.cpp,\
|
||||||
tbarsmpl.cpp,\
|
|
||||||
tabg.cpp,\
|
tabg.cpp,\
|
||||||
textdlgg.cpp,\
|
textdlgg.cpp,\
|
||||||
tipdlg.cpp,\
|
tipdlg.cpp,\
|
||||||
@@ -174,7 +172,6 @@ selstore.obj : selstore.cpp
|
|||||||
splitter.obj : splitter.cpp
|
splitter.obj : splitter.cpp
|
||||||
statline.obj : statline.cpp
|
statline.obj : statline.cpp
|
||||||
statusbr.obj : statusbr.cpp
|
statusbr.obj : statusbr.cpp
|
||||||
tbarsmpl.obj : tbarsmpl.cpp
|
|
||||||
tabg.obj : tabg.cpp
|
tabg.obj : tabg.cpp
|
||||||
textdlgg.obj : textdlgg.cpp
|
textdlgg.obj : textdlgg.cpp
|
||||||
tipdlg.obj : tipdlg.cpp
|
tipdlg.obj : tipdlg.cpp
|
||||||
|
@@ -20,6 +20,10 @@
|
|||||||
#pragma implementation "notebook.h"
|
#pragma implementation "notebook.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef __VMS
|
||||||
|
#pragma message disable unscomzer
|
||||||
|
#endif
|
||||||
|
|
||||||
// For compilers that support precompilation, includes "wx.h".
|
// For compilers that support precompilation, includes "wx.h".
|
||||||
#include "wx/wxprec.h"
|
#include "wx/wxprec.h"
|
||||||
|
|
||||||
|
@@ -614,10 +614,13 @@ bool wxNotebook::InsertPage( size_t position,
|
|||||||
gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate",
|
gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate",
|
||||||
GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win );
|
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 );
|
gtk_notebook_append_page( notebook, win->m_widget, nb_page->m_box );
|
||||||
else
|
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;
|
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) );
|
gtk_widget_show( GTK_WIDGET(nb_page->m_label) );
|
||||||
if (select && (m_pagesData.GetCount() > 1))
|
if (select && (m_pagesData.GetCount() > 1))
|
||||||
{
|
{
|
||||||
|
#ifndef __VMS
|
||||||
|
// On VMS position is unsigned and thus always positive
|
||||||
if (position < 0)
|
if (position < 0)
|
||||||
SetSelection( GetPageCount()-1 );
|
SetSelection( GetPageCount()-1 );
|
||||||
else
|
else
|
||||||
SetSelection( position );
|
#endif
|
||||||
|
SetSelection( position );
|
||||||
}
|
}
|
||||||
|
|
||||||
gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
|
gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
|
||||||
|
@@ -614,10 +614,13 @@ bool wxNotebook::InsertPage( size_t position,
|
|||||||
gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate",
|
gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate",
|
||||||
GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win );
|
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 );
|
gtk_notebook_append_page( notebook, win->m_widget, nb_page->m_box );
|
||||||
else
|
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;
|
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) );
|
gtk_widget_show( GTK_WIDGET(nb_page->m_label) );
|
||||||
if (select && (m_pagesData.GetCount() > 1))
|
if (select && (m_pagesData.GetCount() > 1))
|
||||||
{
|
{
|
||||||
|
#ifndef __VMS
|
||||||
|
// On VMS position is unsigned and thus always positive
|
||||||
if (position < 0)
|
if (position < 0)
|
||||||
SetSelection( GetPageCount()-1 );
|
SetSelection( GetPageCount()-1 );
|
||||||
else
|
else
|
||||||
SetSelection( position );
|
#endif
|
||||||
|
SetSelection( position );
|
||||||
}
|
}
|
||||||
|
|
||||||
gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
|
gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",
|
||||||
|
@@ -40,7 +40,6 @@ OBJECTS = \
|
|||||||
notebook.obj,\
|
notebook.obj,\
|
||||||
radiobox.obj,\
|
radiobox.obj,\
|
||||||
radiobut.obj,\
|
radiobut.obj,\
|
||||||
renderer.obj,\
|
|
||||||
scrarrow.obj,\
|
scrarrow.obj,\
|
||||||
scrolbar.obj,\
|
scrolbar.obj,\
|
||||||
scrthumb.obj,\
|
scrthumb.obj,\
|
||||||
@@ -77,7 +76,6 @@ SOURCES =\
|
|||||||
notebook.cpp \
|
notebook.cpp \
|
||||||
radiobox.cpp \
|
radiobox.cpp \
|
||||||
radiobut.cpp \
|
radiobut.cpp \
|
||||||
renderer.cpp \
|
|
||||||
scrarrow.cpp \
|
scrarrow.cpp \
|
||||||
scrolbar.cpp \
|
scrolbar.cpp \
|
||||||
scrthumb.cpp \
|
scrthumb.cpp \
|
||||||
@@ -118,7 +116,6 @@ menu.obj : menu.cpp
|
|||||||
notebook.obj : notebook.cpp
|
notebook.obj : notebook.cpp
|
||||||
radiobox.obj : radiobox.cpp
|
radiobox.obj : radiobox.cpp
|
||||||
radiobut.obj : radiobut.cpp
|
radiobut.obj : radiobut.cpp
|
||||||
renderer.obj : renderer.cpp
|
|
||||||
scrarrow.obj : scrarrow.cpp
|
scrarrow.obj : scrarrow.cpp
|
||||||
scrolbar.obj : scrolbar.cpp
|
scrolbar.obj : scrolbar.cpp
|
||||||
scrthumb.obj : scrthumb.cpp
|
scrthumb.obj : scrthumb.cpp
|
||||||
|
@@ -21,6 +21,10 @@
|
|||||||
#pragma implementation "univnotebook.h"
|
#pragma implementation "univnotebook.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef __VMS
|
||||||
|
#pragma message disable unscomzer
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/wxprec.h"
|
#include "wx/wxprec.h"
|
||||||
|
|
||||||
#ifdef __BORLANDC__
|
#ifdef __BORLANDC__
|
||||||
|
Reference in New Issue
Block a user