Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Committing in .

Browse Source 
Updates to make OpenVMS happy

 Modified Files:
 	wxWidgets/setup.h_vms wxWidgets/include/wx/defs.h
 	wxWidgets/src/gtk/choice.cpp wxWidgets/src/gtk/descrip.mms
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jouk Jansen
2006-03-22 07:47:22 +00:00
parent b503b4075c
commit bbc8b0ee18
4 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/defs.h
View File

@@ -2873,7 +2873,10 @@ typedef GtkWidget *WXWidget;
#ifdef __WXGTK20__ #ifdef __WXGTK20__
#define G_DISABLE_DEPRECATED #define G_DISABLE_DEPRECATED
#define PANGO_DISABLE_DEPRECATED #define PANGO_DISABLE_DEPRECATED
#define GTK_DISABLE_DEPRECATED #ifndef __VMS
/* GtkCombo is not defined on VMS if this is defined */
# define GTK_DISABLE_DEPRECATED
#endif
#endif #endif
#endif /* __WXGTK__ */ #endif /* __WXGTK__ */

4
setup.h_vms
View File

@@ -630,6 +630,10 @@ typedef pid_t GPid;
* Use GNOME print for printing under GTK+ 2.0 * Use GNOME print for printing under GTK+ 2.0
*/ */
#define wxUSE_LIBGNOMEPRINT 0 #define wxUSE_LIBGNOMEPRINT 0
/*
* Use GNOME VFS for MIME types
*/
#define wxUSE_LIBGNOMEVFS 0
/* /*
* Use the Hildon framework * Use the Hildon framework
*/ */

8
src/gtk/choice.cpp
View File

@@ -483,6 +483,10 @@ void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style)
} }
} }
#ifdef __VMS
#pragma message disable unscomzer
#endif
int wxChoice::GtkAddHelper(GtkWidget *menu, size_t pos, const wxString& item) int wxChoice::GtkAddHelper(GtkWidget *menu, size_t pos, const wxString& item)
{ {
wxCHECK_MSG((pos>=0) && (pos<=m_clientList.GetCount()), -1, wxT("invalid index")); wxCHECK_MSG((pos>=0) && (pos<=m_clientList.GetCount()), -1, wxT("invalid index"));
@@ -551,6 +555,10 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, size_t pos, const wxString& item)
return index; return index;
} }
#ifdef __VMS
#pragma message enable unscomzer
#endif
wxSize wxChoice::DoGetBestSize() const wxSize wxChoice::DoGetBestSize() const
{ {
wxSize ret( wxControl::DoGetBestSize() ); wxSize ret( wxControl::DoGetBestSize() );

9
src/gtk/descrip.mms
View File

@@ -2,7 +2,7 @@
# * # *
# Make file for VMS * # Make file for VMS *
# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) *
# Date : 20 February 2006 * # Date : 20 March 2006 *
# * # *
#***************************************************************************** #*****************************************************************************
.first .first
@@ -101,7 +101,8 @@ OBJECTS0= \
tbargtk.obj,\ tbargtk.obj,\
textctrl.obj,\ textctrl.obj,\
tglbtn.obj,\ tglbtn.obj,\
msgdlg.obj msgdlg.obj,\
treeentry_gtk.obj
SOURCES =\ SOURCES =\
app.cpp,\ app.cpp,\
@@ -169,7 +170,8 @@ SOURCES =\
utilsgtk.cpp,\ utilsgtk.cpp,\
utilsres.cpp,\ utilsres.cpp,\
win_gtk.c,\ win_gtk.c,\
window.cpp window.cpp,\
treeentry_gtk.c
all : $(SOURCES) all : $(SOURCES)
$(MMS)$(MMSQUALIFIERS) $(OBJECTS) $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@@ -256,3 +258,4 @@ utilsgtk.obj : utilsgtk.cpp
utilsres.obj : utilsres.cpp utilsres.obj : utilsres.cpp
win_gtk.obj : win_gtk.c win_gtk.obj : win_gtk.c
window.obj : window.cpp window.obj : window.cpp
treeentry_gtk.obj : treeentry_gtk.c