From: Julian Smart Date: Wed, 26 Jul 2000 12:40:49 +0000 (+0000) Subject: WIN32 compilation of wxrc, wxrcedit X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/031dfec8d45fee38c17c0f8ac01c916c01387d66 WIN32 compilation of wxrc, wxrcedit git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/contrib/utils/wxrc/makefile.b32 b/contrib/utils/wxrc/makefile.b32 new file mode 100644 index 0000000000..ceed75f964 --- /dev/null +++ b/contrib/utils/wxrc/makefile.b32 @@ -0,0 +1,17 @@ +# +# File: makefile.b32 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: +# +# Makefile : Builds wxrc for 32-bit BC++ + +WXDIR = $(WXWIN) + +TARGET=wxrc +EXTRALIBS=$(WXDIR)\lib\wxxml.lib +OBJECTS = $(TARGET).obj + +!include $(WXDIR)\src\makeprog.b32 + diff --git a/contrib/utils/wxrc/makefile.g95 b/contrib/utils/wxrc/makefile.g95 new file mode 100644 index 0000000000..679987d9d5 --- /dev/null +++ b/contrib/utils/wxrc/makefile.g95 @@ -0,0 +1,17 @@ +# +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 +# +# Makefile for wxrc (Cygwin/Mingw32). + +WXDIR = ../../.. + +TARGET=wxrc +EXTRALIBS=-lwxxml +OBJECTS = $(TARGET).o + +include $(WXDIR)/src/makeprog.g95 + diff --git a/contrib/utils/wxrc/makefile.vc b/contrib/utils/wxrc/makefile.vc new file mode 100644 index 0000000000..4623b7a808 --- /dev/null +++ b/contrib/utils/wxrc/makefile.vc @@ -0,0 +1,29 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 2000 +# Updated: +# Copyright: (c) Julian Smart +# +# "%W% %G%" +# +# Makefile : Builds wxrc (XML resource compiler) +# Use FINAL=1 argument to nmake to build final version with no debugging +# info +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=wxrc + +FINAL=0 + +!if "$(FINAL)" == "0" +EXTRALIBS=$(WXDIR)\lib\wxxmld.lib +!else +EXTRALIBS=$(WXDIR)\lib\wxxml.lib +!endif + +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/contrib/utils/wxrc/makefile.wat b/contrib/utils/wxrc/makefile.wat new file mode 100644 index 0000000000..61ee00d06b --- /dev/null +++ b/contrib/utils/wxrc/makefile.wat @@ -0,0 +1,13 @@ +# +# Makefile for WATCOM +# +# + +WXDIR = $(%WXWIN) + +PROGRAM = wxrc +EXTRALIBS = $(WXDIR)\lib\wxxml.lib +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.wat + diff --git a/contrib/utils/wxrc/mondrian.ico b/contrib/utils/wxrc/mondrian.ico new file mode 100644 index 0000000000..2310c5d275 Binary files /dev/null and b/contrib/utils/wxrc/mondrian.ico differ diff --git a/contrib/utils/wxrc/wxrc.cpp b/contrib/utils/wxrc/wxrc.cpp index 64a81ea2c2..f346b485ae 100644 --- a/contrib/utils/wxrc/wxrc.cpp +++ b/contrib/utils/wxrc/wxrc.cpp @@ -30,16 +30,21 @@ #include "wx/xml/xml.h" #include "wx/ffile.h" - +/* #if wxUSE_GUI #error "You must compile the resource compiler with wxBase!" #endif - +*/ class XmlResApp : public wxApp { public: + +#if wxUSE_GUI + bool OnInit(); +#else virtual int OnRun(); +#endif private: @@ -58,7 +63,11 @@ private: IMPLEMENT_APP(XmlResApp) +#if wxUSE_GUI +bool XmlResApp::OnInit() +#else int XmlResApp::OnRun() +#endif { static const wxCmdLineEntryDesc cmdLineDesc[] = { @@ -87,11 +96,19 @@ int XmlResApp::OnRun() retCode = 0; ParseParams(parser); CompileRes(); +#if wxUSE_GUI + return FALSE; +#else return retCode; +#endif break; default: +#if wxUSE_GUI + return FALSE; +#else return 1; +#endif break; } } diff --git a/contrib/utils/wxrc/wxrc.rc b/contrib/utils/wxrc/wxrc.rc new file mode 100644 index 0000000000..74b8e3f417 --- /dev/null +++ b/contrib/utils/wxrc/wxrc.rc @@ -0,0 +1,2 @@ +mondrian ICON "mondrian.ico" +#include "wx/msw/wx.rc" diff --git a/contrib/utils/wxrcedit/editor.cpp b/contrib/utils/wxrcedit/editor.cpp index 15aa1fa98f..2774f957a3 100644 --- a/contrib/utils/wxrcedit/editor.cpp +++ b/contrib/utils/wxrcedit/editor.cpp @@ -104,7 +104,7 @@ END_EVENT_TABLE() -#ifdef __UNIX__ +#if defined(__UNIX__) || wxUSE_XPM_IN_MSW #include "bitmaps/preview.xpm" #include "bitmaps/close.xpm" #include "bitmaps/save.xpm" @@ -119,6 +119,12 @@ END_EVENT_TABLE() #include "bitmaps/used.xpm" #endif +#if defined(__WXMSW__) && defined(wxUSE_XPM_IN_MSW) +#undef wxBITMAP +#define wxBITMAP(arg) wxBitmap(arg##_xpm) +#undef wxICON +#define wxICON(arg) wxIcon(arg##_xpm) +#endif EditorFrame *EditorFrame::ms_Instance = NULL; @@ -164,6 +170,9 @@ EditorFrame::EditorFrame(wxFrame *parent, const wxString& filename) // Create toolbar: wxToolBar *toolBar = CreateToolBar(wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT); +#ifdef __WXMSW__ + toolBar->SetToolBitmapSize(wxSize(24, 24)); +#endif toolBar->SetMargins(2, 2); toolBar -> AddTool(ID_EXIT, wxBITMAP(close), wxNullBitmap, FALSE, -1, -1, (wxObject *) NULL, diff --git a/contrib/utils/wxrcedit/editor.h b/contrib/utils/wxrcedit/editor.h index 72333a3143..2d5649413c 100644 --- a/contrib/utils/wxrcedit/editor.h +++ b/contrib/utils/wxrcedit/editor.h @@ -16,13 +16,14 @@ class wxXmlNode; -class wxTreeCtrl; -class wxScrolledWindow; -class wxSplitterWindow; +class WXDLLEXPORT wxTreeCtrl; +class WXDLLEXPORT wxScrolledWindow; +class WXDLLEXPORT wxSplitterWindow; #include "wx/frame.h" - - +#include "wx/treectrl.h" +#include "wx/imaglist.h" +#include "wx/listctrl.h" class NodeHandler; class wxXmlNode; diff --git a/contrib/utils/wxrcedit/makefile.b32 b/contrib/utils/wxrcedit/makefile.b32 new file mode 100644 index 0000000000..928e48e53a --- /dev/null +++ b/contrib/utils/wxrcedit/makefile.b32 @@ -0,0 +1,17 @@ +# +# File: makefile.b32 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: +# +# Makefile : Builds wxrcedit for 32-bit BC++ + +WXDIR = $(WXWIN) + +TARGET=wxrcedit +EXTRALIBS=$(WXDIR)\lib\wxxml.lib +OBJECTS=edapp.obj editor.obj nodehnd.obj prophnd.obj xmlhelpr.obj + +!include $(WXDIR)\src\makeprog.b32 + diff --git a/contrib/utils/wxrcedit/makefile.g95 b/contrib/utils/wxrcedit/makefile.g95 new file mode 100644 index 0000000000..aa9b29e941 --- /dev/null +++ b/contrib/utils/wxrcedit/makefile.g95 @@ -0,0 +1,16 @@ +# +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 +# +# Makefile for wxrc (Cygwin/Mingw32). + +WXDIR = ../../.. + +TARGET=wxrcedit +EXTRALIBS=-lwxxml +OBJECTS = edapp.o editor.o nodehnd.o prophnd.o xmlhelpr.o +include $(WXDIR)/src/makeprog.g95 + diff --git a/contrib/utils/wxrcedit/makefile.vc b/contrib/utils/wxrcedit/makefile.vc new file mode 100644 index 0000000000..6afdf3440e --- /dev/null +++ b/contrib/utils/wxrcedit/makefile.vc @@ -0,0 +1,29 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 2000 +# Updated: +# Copyright: (c) Julian Smart +# +# "%W% %G%" +# +# Makefile : Builds wxrcedit +# Use FINAL=1 argument to nmake to build final version with no debugging +# info +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=wxrcedit + +FINAL=0 + +!if "$(FINAL)" == "0" +EXTRALIBS=$(WXDIR)\lib\wxxmld.lib +!else +EXTRALIBS=$(WXDIR)\lib\wxxml.lib +!endif + +OBJECTS=edapp.obj editor.obj nodehnd.obj prophnd.obj xmlhelpr.obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/contrib/utils/wxrcedit/makefile.wat b/contrib/utils/wxrcedit/makefile.wat new file mode 100644 index 0000000000..79575603c7 --- /dev/null +++ b/contrib/utils/wxrcedit/makefile.wat @@ -0,0 +1,13 @@ +# +# Makefile for WATCOM +# +# + +WXDIR = $(%WXWIN) + +PROGRAM = wxrcedit +EXTRALIBS = $(WXDIR)\lib\wxxml.lib +OBJECTS = edapp.obj editor.obj nodehnd.obj prophnd.obj xmlhelpr.obj + +!include $(WXDIR)\src\makeprog.wat + diff --git a/contrib/utils/wxrcedit/mondrian.ico b/contrib/utils/wxrcedit/mondrian.ico new file mode 100644 index 0000000000..2310c5d275 Binary files /dev/null and b/contrib/utils/wxrcedit/mondrian.ico differ diff --git a/contrib/utils/wxrcedit/wxrcedit.rc b/contrib/utils/wxrcedit/wxrcedit.rc new file mode 100644 index 0000000000..74b8e3f417 --- /dev/null +++ b/contrib/utils/wxrcedit/wxrcedit.rc @@ -0,0 +1,2 @@ +mondrian ICON "mondrian.ico" +#include "wx/msw/wx.rc" diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp index 67bffaec61..a9d5c3a659 100644 --- a/distrib/msw/vc.rsp +++ b/distrib/msw/vc.rsp @@ -255,6 +255,11 @@ contrib/samples/ogl/ogledit/OgleditVC.dsw contrib/samples/ogl/studio/StudioVC.dsp contrib/samples/ogl/studio/StudioVC.dsw +contrib/src/xml/wxXMLVC.dsp +contrib/src/xml/wxXMLVC.dsw + +contrib/samples/ogl/ogledit/OgleditVC.dsp + contrib/src/mmedia/MmediaVC.dsp contrib/src/mmedia/MMediaVC.dsw @@ -267,3 +272,6 @@ contrib/src/stc/StcVC.dsw contrib/samples/stc/StcTestVC.dsp contrib/samples/stc/StcTestVC.dsw +contrib/utils/wxrc/wxrcVC.dsp +contrib/utils/wxrc/wxrcVC.dsw + diff --git a/distrib/msw/wxrc.rsp b/distrib/msw/wxrc.rsp new file mode 100644 index 0000000000..344769a465 --- /dev/null +++ b/distrib/msw/wxrc.rsp @@ -0,0 +1,90 @@ +contrib/docs/html/xml/*.htm +contrib/docs/html/xml/*.gif +contrib/docs/html/xml/*.png +contrib/docs/winhelp/xml.hlp +contrib/docs/winhelp/xml.cnt +contrib/docs/pdf/xml.pdf + +contrib/docs/latex/xml/*.tex +contrib/docs/latex/xml/*.sty +contrib/docs/latex/xml/*.bib +contrib/docs/latex/xml/*.hpj +contrib/docs/latex/xml/*.ini +contrib/docs/latex/xml/*.txt +contrib/docs/latex/xml/*.cnt +contrib/docs/latex/xml/*.eps +contrib/docs/latex/xml/*.bmp +contrib/docs/latex/xml/*.gif +contrib/docs/latex/xml/*.wmf + +contrib/src/xml/*.cpp +contrib/src/xml/*.h +contrib/src/xml/*.rc +contrib/src/xml/*.def +contrib/src/xml/*.xbm +contrib/src/xml/*.xpm +contrib/src/xml/makefile.vc +contrib/src/xml/makefile.bcc +contrib/src/xml/makefile.b32 +contrib/src/xml/makefile.wat +contrib/src/xml/makefile.g95 +contrib/src/xml/makefile.unx +contrib/src/xml/makefile.dos +contrib/src/xml/makefile.vms +contrib/src/xml/Makefile.in +contrib/src/xml/*.txt +contrib/src/xml/*.ico +contrib/src/xml/*.bmp + +contrib/include/wx/xml/*.h + +contrib/utils/wxrc/*.cpp +contrib/utils/wxrc/*.h +contrib/utils/wxrc/*.rc +contrib/utils/wxrc/*.def +contrib/utils/wxrc/*.xbm +contrib/utils/wxrc/makefile.vc +contrib/utils/wxrc/makefile.bcc +contrib/utils/wxrc/makefile.b32 +contrib/utils/wxrc/makefile.wat +contrib/utils/wxrc/makefile.g95 +contrib/utils/wxrc/makefile.unx +contrib/utils/wxrc/makefile.dos +contrib/utils/wxrc/makefile.vms +contrib/utils/wxrc/Makefile.in +contrib/utils/wxrc/*.txt +contrib/utils/wxrc/*.ico +contrib/utils/wxrc/*.bmp +contrib/utils/wxrc/*.xpm +contrib/utils/wxrc/wxrcVC.dsp +contrib/utils/wxrc/wxrcVC.dsw + +contrib/utils/wxrcedit/*.cpp +contrib/utils/wxrcedit/*.h +contrib/utils/wxrcedit/*.rc +contrib/utils/wxrcedit/*.def +contrib/utils/wxrcedit/*.xbm +contrib/utils/wxrcedit/makefile.vc +contrib/utils/wxrcedit/makefile.bcc +contrib/utils/wxrcedit/makefile.b32 +contrib/utils/wxrcedit/makefile.wat +contrib/utils/wxrcedit/makefile.g95 +contrib/utils/wxrcedit/makefile.unx +contrib/utils/wxrcedit/makefile.dos +contrib/utils/wxrcedit/makefile.vms +contrib/utils/wxrcedit/Makefile.in +contrib/utils/wxrcedit/wxrcEditVC.dsp +contrib/utils/wxrcedit/wxrcEditVC.dsw +contrib/utils/wxrcedit/*.txt +contrib/utils/wxrcedit/*.ico +contrib/utils/wxrcedit/*.bmp +contrib/utils/wxrcedit/*.xpm +contrib/utils/wxrcedit/bitmaps/*.bmp +contrib/utils/wxrcedit/bitmaps/*.ico +contrib/utils/wxrcedit/bitmaps/*.xpm +contrib/utils/wxrcedit/df/*.df + +distrib/msw/xml.rsp +distrib/msw/zipxml.bat + + diff --git a/src/wxvc.dsp b/src/wxvc.dsp index a69945aef9..29e1b1ba50 100644 --- a/src/wxvc.dsp +++ b/src/wxvc.dsp @@ -97,6 +97,10 @@ SOURCE=.\common\clipcmn.cpp # End Source File # Begin Source File +SOURCE=.\common\cmdline.cpp +# End Source File +# Begin Source File + SOURCE=.\common\cmndata.cpp # End Source File # Begin Source File diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp index 77aaee5177..e40a2e1679 100644 --- a/src/wxvc_dll.dsp +++ b/src/wxvc_dll.dsp @@ -104,6 +104,10 @@ SOURCE=.\common\clipcmn.cpp # End Source File # Begin Source File +SOURCE=.\common\cmdline.cpp +# End Source File +# Begin Source File + SOURCE=.\common\cmndata.cpp # End Source File # Begin Source File diff --git a/utils/wxrc/makefile.b32 b/utils/wxrc/makefile.b32 new file mode 100644 index 0000000000..ceed75f964 --- /dev/null +++ b/utils/wxrc/makefile.b32 @@ -0,0 +1,17 @@ +# +# File: makefile.b32 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: +# +# Makefile : Builds wxrc for 32-bit BC++ + +WXDIR = $(WXWIN) + +TARGET=wxrc +EXTRALIBS=$(WXDIR)\lib\wxxml.lib +OBJECTS = $(TARGET).obj + +!include $(WXDIR)\src\makeprog.b32 + diff --git a/utils/wxrc/makefile.g95 b/utils/wxrc/makefile.g95 new file mode 100644 index 0000000000..679987d9d5 --- /dev/null +++ b/utils/wxrc/makefile.g95 @@ -0,0 +1,17 @@ +# +# File: makefile.g95 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: (c) Julian Smart, 1999 +# +# Makefile for wxrc (Cygwin/Mingw32). + +WXDIR = ../../.. + +TARGET=wxrc +EXTRALIBS=-lwxxml +OBJECTS = $(TARGET).o + +include $(WXDIR)/src/makeprog.g95 + diff --git a/utils/wxrc/makefile.vc b/utils/wxrc/makefile.vc new file mode 100644 index 0000000000..4623b7a808 --- /dev/null +++ b/utils/wxrc/makefile.vc @@ -0,0 +1,29 @@ +# +# File: makefile.vc +# Author: Julian Smart +# Created: 2000 +# Updated: +# Copyright: (c) Julian Smart +# +# "%W% %G%" +# +# Makefile : Builds wxrc (XML resource compiler) +# Use FINAL=1 argument to nmake to build final version with no debugging +# info +# Set WXDIR for your system +WXDIR = $(WXWIN) + +PROGRAM=wxrc + +FINAL=0 + +!if "$(FINAL)" == "0" +EXTRALIBS=$(WXDIR)\lib\wxxmld.lib +!else +EXTRALIBS=$(WXDIR)\lib\wxxml.lib +!endif + +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.vc + diff --git a/utils/wxrc/makefile.wat b/utils/wxrc/makefile.wat new file mode 100644 index 0000000000..61ee00d06b --- /dev/null +++ b/utils/wxrc/makefile.wat @@ -0,0 +1,13 @@ +# +# Makefile for WATCOM +# +# + +WXDIR = $(%WXWIN) + +PROGRAM = wxrc +EXTRALIBS = $(WXDIR)\lib\wxxml.lib +OBJECTS = $(PROGRAM).obj + +!include $(WXDIR)\src\makeprog.wat + diff --git a/utils/wxrc/mondrian.ico b/utils/wxrc/mondrian.ico new file mode 100644 index 0000000000..2310c5d275 Binary files /dev/null and b/utils/wxrc/mondrian.ico differ diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp index 64a81ea2c2..f346b485ae 100644 --- a/utils/wxrc/wxrc.cpp +++ b/utils/wxrc/wxrc.cpp @@ -30,16 +30,21 @@ #include "wx/xml/xml.h" #include "wx/ffile.h" - +/* #if wxUSE_GUI #error "You must compile the resource compiler with wxBase!" #endif - +*/ class XmlResApp : public wxApp { public: + +#if wxUSE_GUI + bool OnInit(); +#else virtual int OnRun(); +#endif private: @@ -58,7 +63,11 @@ private: IMPLEMENT_APP(XmlResApp) +#if wxUSE_GUI +bool XmlResApp::OnInit() +#else int XmlResApp::OnRun() +#endif { static const wxCmdLineEntryDesc cmdLineDesc[] = { @@ -87,11 +96,19 @@ int XmlResApp::OnRun() retCode = 0; ParseParams(parser); CompileRes(); +#if wxUSE_GUI + return FALSE; +#else return retCode; +#endif break; default: +#if wxUSE_GUI + return FALSE; +#else return 1; +#endif break; } } diff --git a/utils/wxrc/wxrc.rc b/utils/wxrc/wxrc.rc new file mode 100644 index 0000000000..74b8e3f417 --- /dev/null +++ b/utils/wxrc/wxrc.rc @@ -0,0 +1,2 @@ +mondrian ICON "mondrian.ico" +#include "wx/msw/wx.rc"