AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Committing in .

Browse Source 
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:
Jouk Jansen 1999-11-18 14:30:10 +00:00
parent 742ff1e12f
commit 338dd99216
55 changed files with 327 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/utils.h
View File

@ -354,7 +354,14 @@ WXDLLEXPORT void wxRedirectIOToConsole();
#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>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#define wxMAX_RGB 0xff
#define wxMAX_SV 1000

2
src/common/date.cpp
View File

@ -414,7 +414,6 @@ wxString wxDate::FormatDate (int type) const
: (abs(year)) );
return wxString(buf);
}
return wxString(wxT(""));
}
void wxDate::SetFormat( int format )
@ -445,7 +444,6 @@ int wxDate::SetOption( int option, bool action )
default:
return 0;
}
return 0;
}
///////////////////////////////////////////////////////////////

2
src/common/datstrm.cpp
View File

@ -214,7 +214,9 @@ void wxDataOutputStream::WriteDouble(double d)
#if wxUSE_APPLE_IEEE
ConvertToIeeeExtended(d, (unsigned char *)buf);
#else
#ifndef __VMS__
# pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
#endif
buf[0] = '\0';
#endif
m_output->Write(buf, 10);

6
src/common/gdicmn.cpp
View File

@ -41,7 +41,13 @@
#endif
#ifdef __WXMOTIF__
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#endif
#if !USE_SHARED_LIBRARY

7
src/common/image.cpp
View File

@ -1605,8 +1605,13 @@ wxImage::wxImage( const wxBitmap &bitmap )
//-----------------------------------------------------------------------------
#ifdef __WXMOTIF__
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/utils.h"
#include <math.h>

1
src/common/object.cpp
View File

@ -275,7 +275,6 @@ wxObject *wxCreateDynamicObject(const wxChar *name)
}
return (wxObject*) NULL;
}
return (wxObject*) NULL;
}
#if wxUSE_SERIAL

1
src/common/sckipc.cpp
View File

@ -135,7 +135,6 @@ wxConnectionBase *wxTCPClient::MakeConnection (const wxString& host,
delete client;
return NULL;
}
return NULL;
}
wxConnectionBase *wxTCPClient::OnMakeConnection()

2
src/common/txtstrm.cpp
View File

@ -61,8 +61,6 @@ wxChar wxTextInputStream::NextNonSeparators()
return c;
}
// this shouldn't happen
return (wxChar) 0;
}
inline bool wxTextInputStream::EatEOL(const wxChar &c)

3
src/generic/fontdlgg.cpp
View File

@ -371,7 +371,6 @@ wxChar *wxFontWeightIntToString(int weight)
default:
return wxT("Normal");
}
return wxT("Normal");
}
wxChar *wxFontStyleIntToString(int style)
@ -386,7 +385,6 @@ wxChar *wxFontStyleIntToString(int style)
default:
return wxT("Normal");
}
return wxT("Normal");
}
wxChar *wxFontFamilyIntToString(int family)
@ -407,7 +405,6 @@ wxChar *wxFontFamilyIntToString(int family)
default:
return wxT("Swiss");
}
return wxT("Swiss");
}
int wxFontFamilyStringToInt(wxChar *family)

8
src/generic/listctrl.cpp
View File

@ -2592,12 +2592,20 @@ bool wxListCtrl::Create( wxWindow *parent, wxWindowID id,
long s = style;
#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_ICON == 0))
{
s = s | wxLC_LIST;
}
#ifdef __VMS__
#pragma message enable codcauunr
#endif
bool ret = wxControl::Create( parent, id, pos, size, s, name );

7
src/generic/scrolwin.cpp
View File

@ -43,7 +43,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxPanel)
#ifdef __WXMOTIF__
// 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>
#ifdef __VMS__
# pragma message enable nosimpint
#endif
#endif
wxScrolledWindow::wxScrolledWindow()

2
src/generic/splitter.cpp
View File

@ -424,8 +424,6 @@ bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)
else
return FALSE;
}
return FALSE;
}
// Draw 3D effect borders

6
src/motif/app.cpp
View File

@ -39,11 +39,17 @@
#include "wx/resource.h"
#endif
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xresource.h>
#include <X11/Xatom.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

6
src/motif/bitmap.cpp
View File

@ -23,7 +23,13 @@
#include "wx/dcmemory.h"
#include "wx/image.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

6
src/motif/bmpbuttn.cpp
View File

@ -15,8 +15,14 @@
#include "wx/bmpbuttn.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/PushBG.h>
#include <Xm/PushB.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

6
src/motif/button.cpp
View File

@ -17,8 +17,14 @@
#include "wx/utils.h"
#include "wx/panel.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/PushBG.h>
#include <Xm/PushB.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

6
src/motif/checkbox.cpp
View File

@ -16,10 +16,16 @@
#include "wx/checkbox.h"
#include "wx/utils.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Label.h>
#include <Xm/LabelG.h>
#include <Xm/ToggleB.h>
#include <Xm/ToggleBG.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

6
src/motif/choice.cpp
View File

@ -17,10 +17,16 @@
#include "wx/choice.h"
#include "wx/utils.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#include <Xm/PushBG.h>
#include <Xm/PushB.h>
#include <Xm/RowColumn.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

6
src/motif/clipbrd.cpp
View File

@ -26,8 +26,14 @@
#include "wx/clipbrd.h"
#include "wx/dataobj.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#include <Xm/CutPaste.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include <string.h>

6
src/motif/colour.cpp
View File

@ -20,7 +20,13 @@
#include "wx/colour.h"
#include "wx/app.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

6
src/motif/combobox.cpp
View File

@ -17,7 +17,13 @@
#if wxUSE_COMBOBOX
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "xmcombo/xmcombo.h"
void wxComboBoxCallback (Widget w, XtPointer clientData,

6
src/motif/control.cpp
View File

@ -17,7 +17,13 @@
#include "wx/panel.h"
#include "wx/utils.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#if !USE_SHARED_LIBRARY
IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)

6
src/motif/cursor.cpp
View File

@ -19,8 +19,14 @@
#include "wx/app.h"
#include "wx/utils.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#include <X11/cursorfont.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

6
src/motif/dataobj.cpp
View File

@ -18,7 +18,13 @@
#include "wx/dataobj.h"
#include "wx/app.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/utils.h"
//-------------------------------------------------------------------------

6
src/motif/dcclient.cpp
View File

@ -48,7 +48,13 @@
#include <math.h>
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

6
src/motif/dcmemory.cpp
View File

@ -17,7 +17,13 @@
#include "wx/settings.h"
#include "wx/utils.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

6
src/motif/dcscreen.cpp
View File

@ -17,7 +17,13 @@
#include "wx/dcscreen.h"
#include "wx/utils.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

6
src/motif/dialog.cpp
View File

@ -19,6 +19,9 @@
#include "wx/app.h"
#include "wx/settings.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#include <X11/Shell.h>
@ -38,6 +41,9 @@
#if XmVersion > 1000
#include <Xm/Protocols.h>
#endif
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

6
src/motif/filedlg.cpp
View File

@ -21,6 +21,9 @@
#include "wx/app.h"
#include "wx/settings.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#include <Xm/MwmUtil.h>
#include <Xm/Label.h>
@ -31,6 +34,9 @@
#include <Xm/FileSB.h>
#include <Xm/RowColumn.h>
#include <Xm/LabelG.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

6
src/motif/font.cpp
View File

@ -21,7 +21,13 @@
#pragma implementation "font.h"
#endif
#ifdef __VMS
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#ifdef __VMS
#pragma message enable nosimpint
#endif
#include "wx/defs.h"
#include "wx/string.h"

14
src/motif/frame.cpp
View File

@ -24,6 +24,9 @@
#include "wx/app.h"
#include "wx/utils.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#if defined(__ultrix) || defined(__sgi)
#include <Xm/Frame.h>
#endif
@ -47,6 +50,9 @@
#if XmVersion > 1000
#include <Xm/Protocols.h>
#endif
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"
@ -836,6 +842,14 @@ void wxFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
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)
bool wxFrame::Destroy()
{

6
src/motif/gauge.cpp
View File

@ -15,7 +15,13 @@
#include "wx/gauge.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"
#if !USE_SHARED_LIBRARY

6
src/motif/icon.cpp
View File

@ -16,8 +16,14 @@
#include "wx/icon.h"
#include "wx/window.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#include <X11/cursorfont.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

6
src/motif/listbox.cpp
View File

@ -19,7 +19,13 @@
#include "wx/log.h"
#include "wx/utils.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/List.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"
#if !USE_SHARED_LIBRARY

6
src/motif/mdi.cpp
View File

@ -17,6 +17,9 @@
#include "wx/menu.h"
#include "wx/settings.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#include <Xm/BulletinB.h>
#include <Xm/Form.h>
@ -27,6 +30,9 @@
#include <Xm/PushBG.h>
#include <Xm/AtomMgr.h>
#include <Xm/Protocols.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

6
src/motif/menu.cpp
View File

@ -30,6 +30,9 @@
#include "wx/frame.h"
#include "wx/settings.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Label.h>
#include <Xm/LabelG.h>
#include <Xm/CascadeBG.h>
@ -39,6 +42,9 @@
#include <Xm/ToggleB.h>
#include <Xm/ToggleBG.h>
#include <Xm/RowColumn.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

6
src/motif/menuitem.cpp
View File

@ -26,6 +26,9 @@
#include "wx/utils.h"
#include "wx/frame.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Label.h>
#include <Xm/LabelG.h>
#include <Xm/CascadeBG.h>
@ -35,6 +38,9 @@
#include <Xm/ToggleB.h>
#include <Xm/ToggleBG.h>
#include <Xm/RowColumn.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

6
src/motif/msgdlg.cpp
View File

@ -21,10 +21,16 @@
// headers
// ----------------------------------------------------------------------------
#ifdef __VMS
#pragma message disable nosimpint
#endif
#include <X11/Xlib.h>
#include <Xm/Xm.h>
#include <Xm/MessageB.h>
#ifdef __VMS
#pragma message enable nosimpint
#endif
#include "wx/app.h"
#include "wx/intl.h"

6
src/motif/palette.cpp
View File

@ -43,7 +43,13 @@ not the functionality that wxPalette::Create() aims to provide.
#include "wx/app.h"
#include "wx/utils.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"
#if !USE_SHARED_LIBRARIES

15
src/motif/radiobox.cpp
View File

@ -16,6 +16,9 @@
#include "wx/radiobox.h"
#include "wx/utils.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Label.h>
#include <Xm/LabelG.h>
#include <Xm/ToggleB.h>
@ -23,6 +26,9 @@
#include <Xm/RowColumn.h>
#include <Xm/Form.h>
#include <Xm/Frame.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"
@ -167,8 +173,17 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
#endif
XmNfontList, fontList,
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,
(XtCallbackProc) this);
#ifdef __VMS__
#pragma message enable voiincconext
#endif
}
SetSelection (0);

15
src/motif/radiobut.cpp
View File

@ -16,12 +16,18 @@
#include "wx/radiobut.h"
#include "wx/utils.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Label.h>
#include <Xm/LabelG.h>
#include <Xm/ToggleB.h>
#include <Xm/ToggleBG.h>
#include <Xm/RowColumn.h>
#include <Xm/Form.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"
@ -79,8 +85,17 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
NULL);
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,
(XtCallbackProc) this);
#ifdef __VMS__
#pragma message enable voiincconext
#endif
m_mainWidget = (WXWidget) radioButtonWidget;

6
src/motif/region.cpp
View File

@ -15,7 +15,13 @@
#include "wx/region.h"
#include "wx/gdicmn.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
// #include "wx/motif/private.h"
#if !USE_SHARED_LIBRARY

6
src/motif/scrolbar.cpp
View File

@ -15,10 +15,16 @@
#include "wx/scrolbar.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <X11/IntrinsicP.h>
#include <Xm/Xm.h>
#include <Xm/RowColumn.h>
#include <Xm/ScrollBar.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

1
src/motif/settings.cpp
View File

@ -222,6 +222,5 @@ int wxSystemSettings::GetSystemMetric(int index)
default:
return 0;
}
return 0;
}

14
src/motif/slider.cpp
View File

@ -16,11 +16,17 @@
#include "wx/slider.h"
#include "wx/utils.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#include <Xm/Label.h>
#include <Xm/LabelG.h>
#include <Xm/RowColumn.h>
#include <Xm/Scale.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"
@ -93,12 +99,20 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
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)
XtAddCallback (sliderWidget, XmNdragCallback,
(XtCallbackProc) wxSliderCallback, (XtPointer) this);
else
XtAddCallback (sliderWidget, XmNvalueChangedCallback,
(XtCallbackProc) wxSliderCallback, (XtPointer) this);
#ifdef __VMS__
#pragma message enable codcauunr
#endif
XtAddCallback (sliderWidget, XmNdragCallback, (XtCallbackProc) wxSliderCallback, (XtPointer) this);

6
src/motif/statbmp.cpp
View File

@ -15,10 +15,16 @@
#include "wx/statbmp.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#include <Xm/Label.h>
#include <Xm/LabelG.h>
#include <Xm/RowColumn.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

6
src/motif/statbox.cpp
View File

@ -16,10 +16,16 @@
#include "wx/statbox.h"
#include "wx/utils.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Frame.h>
#include <Xm/Form.h>
#include <Xm/Label.h>
#include <Xm/LabelG.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

6
src/motif/stattext.cpp
View File

@ -18,9 +18,15 @@
#include <stdio.h>
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Label.h>
#include <Xm/LabelG.h>
#include <Xm/PushBG.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)

6
src/motif/textctrl.cpp
View File

@ -31,7 +31,13 @@
#include "wx/filefn.h"
#include "wx/utils.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Text.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

6
src/motif/timer.cpp
View File

@ -17,7 +17,13 @@
#include "wx/app.h"
#include "wx/list.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

6
src/motif/toolbar.cpp
View File

@ -18,6 +18,9 @@
#include "wx/timer.h"
#include "wx/toolbar.h"
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#include <Xm/PushBG.h>
#include <Xm/PushB.h>
@ -25,6 +28,9 @@
#include <Xm/ToggleB.h>
#include <Xm/ToggleBG.h>
#include <Xm/Form.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

12
src/motif/utils.cpp
View File

@ -41,7 +41,13 @@
#include <sysent.h>
#endif
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/unix/execute.h"
@ -689,8 +695,6 @@ bool wxSetDisplay(const wxString& display_name)
else
return FALSE;
}
return FALSE;
}
wxString wxGetDisplayName()
@ -731,6 +735,7 @@ char * wxFindAccelerator (const char *s)
// handling
return NULL;
#if 0
// The accelerator text is after the \t char.
while (*s && *s != '\t')
s++;
@ -778,6 +783,7 @@ char * wxFindAccelerator (const char *s)
}
delete[]tmp;
return wxBuffer;
#endif
}
XmString wxFindAcceleratorText (const char *s)
@ -786,6 +792,7 @@ XmString wxFindAcceleratorText (const char *s)
// handling
return NULL;
#if 0
// The accelerator text is after the \t char.
while (*s && *s != '\t')
s++;
@ -794,6 +801,7 @@ XmString wxFindAcceleratorText (const char *s)
s++;
XmString text = XmStringCreateSimple ((char *)s);
return text;
#endif
}
// ----------------------------------------------------------------------------

6
src/motif/window.cpp
View File

@ -44,6 +44,9 @@
#include "wx/dnd.h"
#endif
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#include <Xm/DrawingA.h>
@ -52,6 +55,9 @@
#include <Xm/Frame.h>
#include <Xm/Label.h>
#include <Xm/RowColumn.h> // for XmMenuPosition
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

6
src/unix/fontutil.cpp
View File

@ -32,7 +32,13 @@
#endif // PCH
#ifdef __X__
#ifdef __VMS__
#pragma message disable nosimpint
#endif
#include <X11/Xlib.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
#include "wx/utils.h" // for wxGetDisplay()
#elif defined(__WXGTK__)

1
src/unix/utilsunx.cpp
View File

@ -393,6 +393,7 @@ long wxExecute( wxChar **argv, bool sync, wxProcess *process )
return exitcode;
#endif // wxUSE_GUI
}
return 0;
#undef ARGS_CLEANUP
}