Committing in .
Modifications to get rid of warnings on VMS Modified Files: wxWindows/include/wx/utils.h wxWindows/src/common/date.cpp wxWindows/src/common/datstrm.cpp wxWindows/src/common/gdicmn.cpp wxWindows/src/common/image.cpp wxWindows/src/common/object.cpp wxWindows/src/common/sckipc.cpp wxWindows/src/common/txtstrm.cpp wxWindows/src/generic/fontdlgg.cpp wxWindows/src/generic/listctrl.cpp wxWindows/src/generic/scrolwin.cpp wxWindows/src/generic/splitter.cpp wxWindows/src/motif/app.cpp wxWindows/src/motif/bitmap.cpp wxWindows/src/motif/bmpbuttn.cpp wxWindows/src/motif/button.cpp wxWindows/src/motif/checkbox.cpp wxWindows/src/motif/choice.cpp wxWindows/src/motif/clipbrd.cpp wxWindows/src/motif/colour.cpp wxWindows/src/motif/combobox.cpp wxWindows/src/motif/control.cpp wxWindows/src/motif/cursor.cpp wxWindows/src/motif/dataobj.cpp wxWindows/src/motif/dcclient.cpp wxWindows/src/motif/dcmemory.cpp wxWindows/src/motif/dcscreen.cpp wxWindows/src/motif/dialog.cpp wxWindows/src/motif/filedlg.cpp wxWindows/src/motif/font.cpp wxWindows/src/motif/frame.cpp wxWindows/src/motif/gauge.cpp wxWindows/src/motif/icon.cpp wxWindows/src/motif/listbox.cpp wxWindows/src/motif/mdi.cpp wxWindows/src/motif/menu.cpp wxWindows/src/motif/menuitem.cpp wxWindows/src/motif/msgdlg.cpp wxWindows/src/motif/palette.cpp wxWindows/src/motif/radiobox.cpp wxWindows/src/motif/radiobut.cpp wxWindows/src/motif/region.cpp wxWindows/src/motif/scrolbar.cpp wxWindows/src/motif/settings.cpp wxWindows/src/motif/slider.cpp wxWindows/src/motif/statbmp.cpp wxWindows/src/motif/statbox.cpp wxWindows/src/motif/stattext.cpp wxWindows/src/motif/textctrl.cpp wxWindows/src/motif/timer.cpp wxWindows/src/motif/toolbar.cpp wxWindows/src/motif/utils.cpp wxWindows/src/motif/window.cpp wxWindows/src/unix/fontutil.cpp wxWindows/src/unix/utilsunx.cpp ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -354,7 +354,14 @@ WXDLLEXPORT void wxRedirectIOToConsole();
|
|||||||
|
|
||||||
#ifdef __X__
|
#ifdef __X__
|
||||||
|
|
||||||
|
#ifdef __VMS__ // Xlib.h for VMS is not (yet) compatible with C++
|
||||||
|
// The resulting warnings are switched off here
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#define wxMAX_RGB 0xff
|
#define wxMAX_RGB 0xff
|
||||||
#define wxMAX_SV 1000
|
#define wxMAX_SV 1000
|
||||||
|
|||||||
@@ -414,7 +414,6 @@ wxString wxDate::FormatDate (int type) const
|
|||||||
: (abs(year)) );
|
: (abs(year)) );
|
||||||
return wxString(buf);
|
return wxString(buf);
|
||||||
}
|
}
|
||||||
return wxString(wxT(""));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxDate::SetFormat( int format )
|
void wxDate::SetFormat( int format )
|
||||||
@@ -445,7 +444,6 @@ int wxDate::SetOption( int option, bool action )
|
|||||||
default:
|
default:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////
|
||||||
|
|||||||
@@ -214,8 +214,10 @@ void wxDataOutputStream::WriteDouble(double d)
|
|||||||
#if wxUSE_APPLE_IEEE
|
#if wxUSE_APPLE_IEEE
|
||||||
ConvertToIeeeExtended(d, (unsigned char *)buf);
|
ConvertToIeeeExtended(d, (unsigned char *)buf);
|
||||||
#else
|
#else
|
||||||
# pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
|
#ifndef __VMS__
|
||||||
buf[0] = '\0';
|
# pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
|
||||||
|
#endif
|
||||||
|
buf[0] = '\0';
|
||||||
#endif
|
#endif
|
||||||
m_output->Write(buf, 10);
|
m_output->Write(buf, 10);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,7 +41,13 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __WXMOTIF__
|
#ifdef __WXMOTIF__
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !USE_SHARED_LIBRARY
|
#if !USE_SHARED_LIBRARY
|
||||||
|
|||||||
@@ -1605,8 +1605,13 @@ wxImage::wxImage( const wxBitmap &bitmap )
|
|||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
#ifdef __WXMOTIF__
|
#ifdef __WXMOTIF__
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
|
|||||||
@@ -275,7 +275,6 @@ wxObject *wxCreateDynamicObject(const wxChar *name)
|
|||||||
}
|
}
|
||||||
return (wxObject*) NULL;
|
return (wxObject*) NULL;
|
||||||
}
|
}
|
||||||
return (wxObject*) NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#if wxUSE_SERIAL
|
#if wxUSE_SERIAL
|
||||||
|
|||||||
@@ -135,7 +135,6 @@ wxConnectionBase *wxTCPClient::MakeConnection (const wxString& host,
|
|||||||
delete client;
|
delete client;
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
return NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
wxConnectionBase *wxTCPClient::OnMakeConnection()
|
wxConnectionBase *wxTCPClient::OnMakeConnection()
|
||||||
|
|||||||
@@ -61,8 +61,6 @@ wxChar wxTextInputStream::NextNonSeparators()
|
|||||||
return c;
|
return c;
|
||||||
}
|
}
|
||||||
|
|
||||||
// this shouldn't happen
|
|
||||||
return (wxChar) 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
inline bool wxTextInputStream::EatEOL(const wxChar &c)
|
inline bool wxTextInputStream::EatEOL(const wxChar &c)
|
||||||
|
|||||||
@@ -371,7 +371,6 @@ wxChar *wxFontWeightIntToString(int weight)
|
|||||||
default:
|
default:
|
||||||
return wxT("Normal");
|
return wxT("Normal");
|
||||||
}
|
}
|
||||||
return wxT("Normal");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
wxChar *wxFontStyleIntToString(int style)
|
wxChar *wxFontStyleIntToString(int style)
|
||||||
@@ -386,7 +385,6 @@ wxChar *wxFontStyleIntToString(int style)
|
|||||||
default:
|
default:
|
||||||
return wxT("Normal");
|
return wxT("Normal");
|
||||||
}
|
}
|
||||||
return wxT("Normal");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
wxChar *wxFontFamilyIntToString(int family)
|
wxChar *wxFontFamilyIntToString(int family)
|
||||||
@@ -407,7 +405,6 @@ wxChar *wxFontFamilyIntToString(int family)
|
|||||||
default:
|
default:
|
||||||
return wxT("Swiss");
|
return wxT("Swiss");
|
||||||
}
|
}
|
||||||
return wxT("Swiss");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int wxFontFamilyStringToInt(wxChar *family)
|
int wxFontFamilyStringToInt(wxChar *family)
|
||||||
|
|||||||
@@ -2592,12 +2592,20 @@ bool wxListCtrl::Create( wxWindow *parent, wxWindowID id,
|
|||||||
|
|
||||||
long s = style;
|
long s = style;
|
||||||
|
|
||||||
if ((s & wxLC_REPORT == 0) &&
|
#ifdef __VMS__
|
||||||
|
#pragma message disable codcauunr
|
||||||
|
// VMS reports on this part the warning:
|
||||||
|
// statement either is unreachable or causes unreachable code
|
||||||
|
#endif
|
||||||
|
if ((s & wxLC_REPORT == 0) &&
|
||||||
(s & wxLC_LIST == 0) &&
|
(s & wxLC_LIST == 0) &&
|
||||||
(s & wxLC_ICON == 0))
|
(s & wxLC_ICON == 0))
|
||||||
{
|
{
|
||||||
s = s | wxLC_LIST;
|
s = s | wxLC_LIST;
|
||||||
}
|
}
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable codcauunr
|
||||||
|
#endif
|
||||||
|
|
||||||
bool ret = wxControl::Create( parent, id, pos, size, s, name );
|
bool ret = wxControl::Create( parent, id, pos, size, s, name );
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxPanel)
|
|||||||
|
|
||||||
#ifdef __WXMOTIF__
|
#ifdef __WXMOTIF__
|
||||||
// For wxRETAINED implementation
|
// For wxRETAINED implementation
|
||||||
|
#ifdef __VMS__ //VMS's Xm.h is not (yet) compatible with C++
|
||||||
|
//This code switches off the compiler warnings
|
||||||
|
# pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
# pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
wxScrolledWindow::wxScrolledWindow()
|
wxScrolledWindow::wxScrolledWindow()
|
||||||
|
|||||||
@@ -424,8 +424,6 @@ bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)
|
|||||||
else
|
else
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
return FALSE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Draw 3D effect borders
|
// Draw 3D effect borders
|
||||||
|
|||||||
@@ -39,11 +39,17 @@
|
|||||||
#include "wx/resource.h"
|
#include "wx/resource.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
#include <X11/Xutil.h>
|
#include <X11/Xutil.h>
|
||||||
#include <X11/Xresource.h>
|
#include <X11/Xresource.h>
|
||||||
#include <X11/Xatom.h>
|
#include <X11/Xatom.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,13 @@
|
|||||||
#include "wx/dcmemory.h"
|
#include "wx/dcmemory.h"
|
||||||
#include "wx/image.h"
|
#include "wx/image.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -15,8 +15,14 @@
|
|||||||
|
|
||||||
#include "wx/bmpbuttn.h"
|
#include "wx/bmpbuttn.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/PushBG.h>
|
#include <Xm/PushBG.h>
|
||||||
#include <Xm/PushB.h>
|
#include <Xm/PushB.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -17,8 +17,14 @@
|
|||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
#include "wx/panel.h"
|
#include "wx/panel.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/PushBG.h>
|
#include <Xm/PushBG.h>
|
||||||
#include <Xm/PushB.h>
|
#include <Xm/PushB.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -16,10 +16,16 @@
|
|||||||
#include "wx/checkbox.h"
|
#include "wx/checkbox.h"
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Label.h>
|
#include <Xm/Label.h>
|
||||||
#include <Xm/LabelG.h>
|
#include <Xm/LabelG.h>
|
||||||
#include <Xm/ToggleB.h>
|
#include <Xm/ToggleB.h>
|
||||||
#include <Xm/ToggleBG.h>
|
#include <Xm/ToggleBG.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -17,10 +17,16 @@
|
|||||||
#include "wx/choice.h"
|
#include "wx/choice.h"
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
#include <Xm/PushBG.h>
|
#include <Xm/PushBG.h>
|
||||||
#include <Xm/PushB.h>
|
#include <Xm/PushB.h>
|
||||||
#include <Xm/RowColumn.h>
|
#include <Xm/RowColumn.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -26,8 +26,14 @@
|
|||||||
#include "wx/clipbrd.h"
|
#include "wx/clipbrd.h"
|
||||||
#include "wx/dataobj.h"
|
#include "wx/dataobj.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
#include <Xm/CutPaste.h>
|
#include <Xm/CutPaste.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,13 @@
|
|||||||
#include "wx/colour.h"
|
#include "wx/colour.h"
|
||||||
#include "wx/app.h"
|
#include "wx/app.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,13 @@
|
|||||||
|
|
||||||
#if wxUSE_COMBOBOX
|
#if wxUSE_COMBOBOX
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
#include "xmcombo/xmcombo.h"
|
#include "xmcombo/xmcombo.h"
|
||||||
|
|
||||||
void wxComboBoxCallback (Widget w, XtPointer clientData,
|
void wxComboBoxCallback (Widget w, XtPointer clientData,
|
||||||
|
|||||||
@@ -17,7 +17,13 @@
|
|||||||
#include "wx/panel.h"
|
#include "wx/panel.h"
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#if !USE_SHARED_LIBRARY
|
#if !USE_SHARED_LIBRARY
|
||||||
IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
|
IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
|
||||||
|
|||||||
@@ -19,8 +19,14 @@
|
|||||||
#include "wx/app.h"
|
#include "wx/app.h"
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
#include <X11/cursorfont.h>
|
#include <X11/cursorfont.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,13 @@
|
|||||||
#include "wx/dataobj.h"
|
#include "wx/dataobj.h"
|
||||||
#include "wx/app.h"
|
#include "wx/app.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
|
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -48,7 +48,13 @@
|
|||||||
|
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,13 @@
|
|||||||
#include "wx/settings.h"
|
#include "wx/settings.h"
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,13 @@
|
|||||||
#include "wx/dcscreen.h"
|
#include "wx/dcscreen.h"
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,9 @@
|
|||||||
#include "wx/app.h"
|
#include "wx/app.h"
|
||||||
#include "wx/settings.h"
|
#include "wx/settings.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
|
|
||||||
#include <X11/Shell.h>
|
#include <X11/Shell.h>
|
||||||
@@ -38,6 +41,9 @@
|
|||||||
#if XmVersion > 1000
|
#if XmVersion > 1000
|
||||||
#include <Xm/Protocols.h>
|
#include <Xm/Protocols.h>
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -21,6 +21,9 @@
|
|||||||
#include "wx/app.h"
|
#include "wx/app.h"
|
||||||
#include "wx/settings.h"
|
#include "wx/settings.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
#include <Xm/MwmUtil.h>
|
#include <Xm/MwmUtil.h>
|
||||||
#include <Xm/Label.h>
|
#include <Xm/Label.h>
|
||||||
@@ -31,6 +34,9 @@
|
|||||||
#include <Xm/FileSB.h>
|
#include <Xm/FileSB.h>
|
||||||
#include <Xm/RowColumn.h>
|
#include <Xm/RowColumn.h>
|
||||||
#include <Xm/LabelG.h>
|
#include <Xm/LabelG.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,13 @@
|
|||||||
#pragma implementation "font.h"
|
#pragma implementation "font.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef __VMS
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
|
#ifdef __VMS
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/defs.h"
|
#include "wx/defs.h"
|
||||||
#include "wx/string.h"
|
#include "wx/string.h"
|
||||||
|
|||||||
@@ -24,6 +24,9 @@
|
|||||||
#include "wx/app.h"
|
#include "wx/app.h"
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#if defined(__ultrix) || defined(__sgi)
|
#if defined(__ultrix) || defined(__sgi)
|
||||||
#include <Xm/Frame.h>
|
#include <Xm/Frame.h>
|
||||||
#endif
|
#endif
|
||||||
@@ -47,6 +50,9 @@
|
|||||||
#if XmVersion > 1000
|
#if XmVersion > 1000
|
||||||
#include <Xm/Protocols.h>
|
#include <Xm/Protocols.h>
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
@@ -836,6 +842,14 @@ void wxFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
|
|||||||
this->Destroy();
|
this->Destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
// I added this function because I got missing symbols when linking
|
||||||
|
// Maybe it should be included on all platforms. But what should it do?
|
||||||
|
void wxFrame::OnIdle(wxIdleEvent& WXUNUSED(event))
|
||||||
|
{
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
// Destroy the window (delayed, if a managed window)
|
// Destroy the window (delayed, if a managed window)
|
||||||
bool wxFrame::Destroy()
|
bool wxFrame::Destroy()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -15,7 +15,13 @@
|
|||||||
|
|
||||||
#include "wx/gauge.h"
|
#include "wx/gauge.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
#if !USE_SHARED_LIBRARY
|
#if !USE_SHARED_LIBRARY
|
||||||
|
|||||||
@@ -16,8 +16,14 @@
|
|||||||
#include "wx/icon.h"
|
#include "wx/icon.h"
|
||||||
#include "wx/window.h"
|
#include "wx/window.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
#include <X11/cursorfont.h>
|
#include <X11/cursorfont.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,13 @@
|
|||||||
#include "wx/log.h"
|
#include "wx/log.h"
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/List.h>
|
#include <Xm/List.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
#if !USE_SHARED_LIBRARY
|
#if !USE_SHARED_LIBRARY
|
||||||
|
|||||||
@@ -17,6 +17,9 @@
|
|||||||
#include "wx/menu.h"
|
#include "wx/menu.h"
|
||||||
#include "wx/settings.h"
|
#include "wx/settings.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
#include <Xm/BulletinB.h>
|
#include <Xm/BulletinB.h>
|
||||||
#include <Xm/Form.h>
|
#include <Xm/Form.h>
|
||||||
@@ -27,6 +30,9 @@
|
|||||||
#include <Xm/PushBG.h>
|
#include <Xm/PushBG.h>
|
||||||
#include <Xm/AtomMgr.h>
|
#include <Xm/AtomMgr.h>
|
||||||
#include <Xm/Protocols.h>
|
#include <Xm/Protocols.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -30,6 +30,9 @@
|
|||||||
#include "wx/frame.h"
|
#include "wx/frame.h"
|
||||||
#include "wx/settings.h"
|
#include "wx/settings.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Label.h>
|
#include <Xm/Label.h>
|
||||||
#include <Xm/LabelG.h>
|
#include <Xm/LabelG.h>
|
||||||
#include <Xm/CascadeBG.h>
|
#include <Xm/CascadeBG.h>
|
||||||
@@ -39,6 +42,9 @@
|
|||||||
#include <Xm/ToggleB.h>
|
#include <Xm/ToggleB.h>
|
||||||
#include <Xm/ToggleBG.h>
|
#include <Xm/ToggleBG.h>
|
||||||
#include <Xm/RowColumn.h>
|
#include <Xm/RowColumn.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -26,6 +26,9 @@
|
|||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
#include "wx/frame.h"
|
#include "wx/frame.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Label.h>
|
#include <Xm/Label.h>
|
||||||
#include <Xm/LabelG.h>
|
#include <Xm/LabelG.h>
|
||||||
#include <Xm/CascadeBG.h>
|
#include <Xm/CascadeBG.h>
|
||||||
@@ -35,6 +38,9 @@
|
|||||||
#include <Xm/ToggleB.h>
|
#include <Xm/ToggleB.h>
|
||||||
#include <Xm/ToggleBG.h>
|
#include <Xm/ToggleBG.h>
|
||||||
#include <Xm/RowColumn.h>
|
#include <Xm/RowColumn.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -21,10 +21,16 @@
|
|||||||
// headers
|
// headers
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#ifdef __VMS
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
|
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
#include <Xm/MessageB.h>
|
#include <Xm/MessageB.h>
|
||||||
|
#ifdef __VMS
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/app.h"
|
#include "wx/app.h"
|
||||||
#include "wx/intl.h"
|
#include "wx/intl.h"
|
||||||
|
|||||||
@@ -43,7 +43,13 @@ not the functionality that wxPalette::Create() aims to provide.
|
|||||||
#include "wx/app.h"
|
#include "wx/app.h"
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
#if !USE_SHARED_LIBRARIES
|
#if !USE_SHARED_LIBRARIES
|
||||||
|
|||||||
@@ -16,6 +16,9 @@
|
|||||||
#include "wx/radiobox.h"
|
#include "wx/radiobox.h"
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Label.h>
|
#include <Xm/Label.h>
|
||||||
#include <Xm/LabelG.h>
|
#include <Xm/LabelG.h>
|
||||||
#include <Xm/ToggleB.h>
|
#include <Xm/ToggleB.h>
|
||||||
@@ -23,6 +26,9 @@
|
|||||||
#include <Xm/RowColumn.h>
|
#include <Xm/RowColumn.h>
|
||||||
#include <Xm/Form.h>
|
#include <Xm/Form.h>
|
||||||
#include <Xm/Frame.h>
|
#include <Xm/Frame.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
@@ -167,8 +173,17 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
|
|||||||
#endif
|
#endif
|
||||||
XmNfontList, fontList,
|
XmNfontList, fontList,
|
||||||
NULL);
|
NULL);
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable voiincconext
|
||||||
|
// VMS gives here the compiler warning:
|
||||||
|
// conversion from pointer to function to void* permitted
|
||||||
|
// as an extension
|
||||||
|
#endif
|
||||||
XtAddCallback ((Widget) m_radioButtons[i], XmNvalueChangedCallback, (XtCallbackProc) wxRadioBoxCallback,
|
XtAddCallback ((Widget) m_radioButtons[i], XmNvalueChangedCallback, (XtCallbackProc) wxRadioBoxCallback,
|
||||||
(XtCallbackProc) this);
|
(XtCallbackProc) this);
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable voiincconext
|
||||||
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
SetSelection (0);
|
SetSelection (0);
|
||||||
|
|||||||
@@ -16,12 +16,18 @@
|
|||||||
#include "wx/radiobut.h"
|
#include "wx/radiobut.h"
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Label.h>
|
#include <Xm/Label.h>
|
||||||
#include <Xm/LabelG.h>
|
#include <Xm/LabelG.h>
|
||||||
#include <Xm/ToggleB.h>
|
#include <Xm/ToggleB.h>
|
||||||
#include <Xm/ToggleBG.h>
|
#include <Xm/ToggleBG.h>
|
||||||
#include <Xm/RowColumn.h>
|
#include <Xm/RowColumn.h>
|
||||||
#include <Xm/Form.h>
|
#include <Xm/Form.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
@@ -79,8 +85,17 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
|
|||||||
NULL);
|
NULL);
|
||||||
XmStringFree (text);
|
XmStringFree (text);
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable voiincconext
|
||||||
|
// VMS gives here the compiler warning:
|
||||||
|
// conversion from pointer to function to void* permitted
|
||||||
|
// as an extension
|
||||||
|
#endif
|
||||||
XtAddCallback (radioButtonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxRadioButtonCallback,
|
XtAddCallback (radioButtonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxRadioButtonCallback,
|
||||||
(XtCallbackProc) this);
|
(XtCallbackProc) this);
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable voiincconext
|
||||||
|
#endif
|
||||||
|
|
||||||
m_mainWidget = (WXWidget) radioButtonWidget;
|
m_mainWidget = (WXWidget) radioButtonWidget;
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,13 @@
|
|||||||
#include "wx/region.h"
|
#include "wx/region.h"
|
||||||
#include "wx/gdicmn.h"
|
#include "wx/gdicmn.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
// #include "wx/motif/private.h"
|
// #include "wx/motif/private.h"
|
||||||
|
|
||||||
#if !USE_SHARED_LIBRARY
|
#if !USE_SHARED_LIBRARY
|
||||||
|
|||||||
@@ -15,10 +15,16 @@
|
|||||||
|
|
||||||
#include "wx/scrolbar.h"
|
#include "wx/scrolbar.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <X11/IntrinsicP.h>
|
#include <X11/IntrinsicP.h>
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
#include <Xm/RowColumn.h>
|
#include <Xm/RowColumn.h>
|
||||||
#include <Xm/ScrollBar.h>
|
#include <Xm/ScrollBar.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -222,6 +222,5 @@ int wxSystemSettings::GetSystemMetric(int index)
|
|||||||
default:
|
default:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,11 +16,17 @@
|
|||||||
#include "wx/slider.h"
|
#include "wx/slider.h"
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
#include <Xm/Label.h>
|
#include <Xm/Label.h>
|
||||||
#include <Xm/LabelG.h>
|
#include <Xm/LabelG.h>
|
||||||
#include <Xm/RowColumn.h>
|
#include <Xm/RowColumn.h>
|
||||||
#include <Xm/Scale.h>
|
#include <Xm/Scale.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
@@ -93,12 +99,20 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
|
|||||||
|
|
||||||
m_mainWidget = (WXWidget) sliderWidget;
|
m_mainWidget = (WXWidget) sliderWidget;
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable codcauunr
|
||||||
|
// VMS gives here the compiler warning :
|
||||||
|
// statement either is unreachable or causes unreachable code
|
||||||
|
#endif
|
||||||
if(style & wxSL_NOTIFY_DRAG)
|
if(style & wxSL_NOTIFY_DRAG)
|
||||||
XtAddCallback (sliderWidget, XmNdragCallback,
|
XtAddCallback (sliderWidget, XmNdragCallback,
|
||||||
(XtCallbackProc) wxSliderCallback, (XtPointer) this);
|
(XtCallbackProc) wxSliderCallback, (XtPointer) this);
|
||||||
else
|
else
|
||||||
XtAddCallback (sliderWidget, XmNvalueChangedCallback,
|
XtAddCallback (sliderWidget, XmNvalueChangedCallback,
|
||||||
(XtCallbackProc) wxSliderCallback, (XtPointer) this);
|
(XtCallbackProc) wxSliderCallback, (XtPointer) this);
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable codcauunr
|
||||||
|
#endif
|
||||||
|
|
||||||
XtAddCallback (sliderWidget, XmNdragCallback, (XtCallbackProc) wxSliderCallback, (XtPointer) this);
|
XtAddCallback (sliderWidget, XmNdragCallback, (XtCallbackProc) wxSliderCallback, (XtPointer) this);
|
||||||
|
|
||||||
|
|||||||
@@ -15,10 +15,16 @@
|
|||||||
|
|
||||||
#include "wx/statbmp.h"
|
#include "wx/statbmp.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
#include <Xm/Label.h>
|
#include <Xm/Label.h>
|
||||||
#include <Xm/LabelG.h>
|
#include <Xm/LabelG.h>
|
||||||
#include <Xm/RowColumn.h>
|
#include <Xm/RowColumn.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -16,10 +16,16 @@
|
|||||||
#include "wx/statbox.h"
|
#include "wx/statbox.h"
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Frame.h>
|
#include <Xm/Frame.h>
|
||||||
#include <Xm/Form.h>
|
#include <Xm/Form.h>
|
||||||
#include <Xm/Label.h>
|
#include <Xm/Label.h>
|
||||||
#include <Xm/LabelG.h>
|
#include <Xm/LabelG.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -18,9 +18,15 @@
|
|||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Label.h>
|
#include <Xm/Label.h>
|
||||||
#include <Xm/LabelG.h>
|
#include <Xm/LabelG.h>
|
||||||
#include <Xm/PushBG.h>
|
#include <Xm/PushBG.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#if !USE_SHARED_LIBRARY
|
#if !USE_SHARED_LIBRARY
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
|
IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
|
||||||
|
|||||||
@@ -31,7 +31,13 @@
|
|||||||
#include "wx/filefn.h"
|
#include "wx/filefn.h"
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Text.h>
|
#include <Xm/Text.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,13 @@
|
|||||||
#include "wx/app.h"
|
#include "wx/app.h"
|
||||||
#include "wx/list.h"
|
#include "wx/list.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,9 @@
|
|||||||
#include "wx/timer.h"
|
#include "wx/timer.h"
|
||||||
#include "wx/toolbar.h"
|
#include "wx/toolbar.h"
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
#include <Xm/PushBG.h>
|
#include <Xm/PushBG.h>
|
||||||
#include <Xm/PushB.h>
|
#include <Xm/PushB.h>
|
||||||
@@ -25,6 +28,9 @@
|
|||||||
#include <Xm/ToggleB.h>
|
#include <Xm/ToggleB.h>
|
||||||
#include <Xm/ToggleBG.h>
|
#include <Xm/ToggleBG.h>
|
||||||
#include <Xm/Form.h>
|
#include <Xm/Form.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -41,7 +41,13 @@
|
|||||||
#include <sysent.h>
|
#include <sysent.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/unix/execute.h"
|
#include "wx/unix/execute.h"
|
||||||
|
|
||||||
@@ -689,8 +695,6 @@ bool wxSetDisplay(const wxString& display_name)
|
|||||||
else
|
else
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
return FALSE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
wxString wxGetDisplayName()
|
wxString wxGetDisplayName()
|
||||||
@@ -731,7 +735,8 @@ char * wxFindAccelerator (const char *s)
|
|||||||
// handling
|
// handling
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
// The accelerator text is after the \t char.
|
#if 0
|
||||||
|
// The accelerator text is after the \t char.
|
||||||
while (*s && *s != '\t')
|
while (*s && *s != '\t')
|
||||||
s++;
|
s++;
|
||||||
if (*s == '\0')
|
if (*s == '\0')
|
||||||
@@ -778,6 +783,7 @@ char * wxFindAccelerator (const char *s)
|
|||||||
}
|
}
|
||||||
delete[]tmp;
|
delete[]tmp;
|
||||||
return wxBuffer;
|
return wxBuffer;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
XmString wxFindAcceleratorText (const char *s)
|
XmString wxFindAcceleratorText (const char *s)
|
||||||
@@ -786,7 +792,8 @@ XmString wxFindAcceleratorText (const char *s)
|
|||||||
// handling
|
// handling
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
// The accelerator text is after the \t char.
|
#if 0
|
||||||
|
// The accelerator text is after the \t char.
|
||||||
while (*s && *s != '\t')
|
while (*s && *s != '\t')
|
||||||
s++;
|
s++;
|
||||||
if (*s == '\0')
|
if (*s == '\0')
|
||||||
@@ -794,6 +801,7 @@ XmString wxFindAcceleratorText (const char *s)
|
|||||||
s++;
|
s++;
|
||||||
XmString text = XmStringCreateSimple ((char *)s);
|
XmString text = XmStringCreateSimple ((char *)s);
|
||||||
return text;
|
return text;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -44,6 +44,9 @@
|
|||||||
#include "wx/dnd.h"
|
#include "wx/dnd.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
#include <Xm/Xm.h>
|
#include <Xm/Xm.h>
|
||||||
|
|
||||||
#include <Xm/DrawingA.h>
|
#include <Xm/DrawingA.h>
|
||||||
@@ -52,6 +55,9 @@
|
|||||||
#include <Xm/Frame.h>
|
#include <Xm/Frame.h>
|
||||||
#include <Xm/Label.h>
|
#include <Xm/Label.h>
|
||||||
#include <Xm/RowColumn.h> // for XmMenuPosition
|
#include <Xm/RowColumn.h> // for XmMenuPosition
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/motif/private.h"
|
#include "wx/motif/private.h"
|
||||||
|
|
||||||
|
|||||||
@@ -32,7 +32,13 @@
|
|||||||
#endif // PCH
|
#endif // PCH
|
||||||
|
|
||||||
#ifdef __X__
|
#ifdef __X__
|
||||||
#include <X11/Xlib.h>
|
#ifdef __VMS__
|
||||||
|
#pragma message disable nosimpint
|
||||||
|
#endif
|
||||||
|
#include <X11/Xlib.h>
|
||||||
|
#ifdef __VMS__
|
||||||
|
#pragma message enable nosimpint
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/utils.h" // for wxGetDisplay()
|
#include "wx/utils.h" // for wxGetDisplay()
|
||||||
#elif defined(__WXGTK__)
|
#elif defined(__WXGTK__)
|
||||||
|
|||||||
@@ -393,6 +393,7 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process )
|
|||||||
return exitcode;
|
return exitcode;
|
||||||
#endif // wxUSE_GUI
|
#endif // wxUSE_GUI
|
||||||
}
|
}
|
||||||
|
return 0;
|
||||||
|
|
||||||
#undef ARGS_CLEANUP
|
#undef ARGS_CLEANUP
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user