Committing in .
VMS/GTK compile support Modified Files: wxWindows/descrip.mms wxWindows/setup.h_vms wxWindows/samples/minimal/descrip.mms wxWindows/src/common/descrip.mms wxWindows/src/common/resource.cpp wxWindows/src/generic/descrip.mms wxWindows/src/gtk/dcclient.cpp wxWindows/src/gtk/filedlg.cpp wxWindows/src/gtk/fontdlg.cpp wxWindows/src/gtk/listbox.cpp wxWindows/src/gtk/tbargtk.cpp wxWindows/src/gtk/win_gtk.c wxWindows/src/unix/descrip.mms wxWindows/src/unix/fontenum.cpp Added Files: wxWindows/lib/vms_gtk.opt wxWindows/src/gtk/wx_gtk_vmsjackets.c ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -12,8 +12,12 @@
|
||||
.ifdef __WXMOTIF__
|
||||
CXX_DEFINE = /define=(__WXMOTIF__=1)
|
||||
.else
|
||||
.ifdef __WXGTK__
|
||||
CXX_DEFINE = /define=(__WXGTK__=1)
|
||||
.else
|
||||
CXX_DEFINE =
|
||||
.endif
|
||||
.endif
|
||||
|
||||
YACC=bison/yacc
|
||||
|
||||
@@ -231,6 +235,11 @@ all : $(SOURCES)
|
||||
.ifdef __WXMOTIF__
|
||||
library [--.lib]libwx_motif.olb $(OBJECTS)
|
||||
library [--.lib]libwx_motif.olb $(OBJECTS1)
|
||||
.else
|
||||
.ifdef __WXGTK__
|
||||
library [--.lib]libwx_gtk.olb $(OBJECTS)
|
||||
library [--.lib]libwx_gtk.olb $(OBJECTS1)
|
||||
.endif
|
||||
.endif
|
||||
|
||||
parser.obj : parser.c lexer.c
|
||||
|
||||
@@ -2477,7 +2477,9 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
|
||||
return wxBitmap(name, bitmapType);
|
||||
}
|
||||
}
|
||||
return wxNullBitmap;
|
||||
#ifndef __WXGTK__
|
||||
return wxNullBitmap;
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user