From 031dfec8d45fee38c17c0f8ac01c916c01387d66 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 26 Jul 2000 12:40:49 +0000 Subject: [PATCH] WIN32 compilation of wxrc, wxrcedit git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/utils/wxrc/makefile.b32 | 17 ++++++ contrib/utils/wxrc/makefile.g95 | 17 ++++++ contrib/utils/wxrc/makefile.vc | 29 +++++++++ contrib/utils/wxrc/makefile.wat | 13 ++++ contrib/utils/wxrc/mondrian.ico | Bin 0 -> 766 bytes contrib/utils/wxrc/wxrc.cpp | 21 ++++++- contrib/utils/wxrc/wxrc.rc | 2 + contrib/utils/wxrcedit/editor.cpp | 11 +++- contrib/utils/wxrcedit/editor.h | 11 ++-- contrib/utils/wxrcedit/makefile.b32 | 17 ++++++ contrib/utils/wxrcedit/makefile.g95 | 16 +++++ contrib/utils/wxrcedit/makefile.vc | 29 +++++++++ contrib/utils/wxrcedit/makefile.wat | 13 ++++ contrib/utils/wxrcedit/mondrian.ico | Bin 0 -> 766 bytes contrib/utils/wxrcedit/wxrcedit.rc | 2 + distrib/msw/vc.rsp | 8 +++ distrib/msw/wxrc.rsp | 90 ++++++++++++++++++++++++++++ src/wxvc.dsp | 4 ++ src/wxvc_dll.dsp | 4 ++ utils/wxrc/makefile.b32 | 17 ++++++ utils/wxrc/makefile.g95 | 17 ++++++ utils/wxrc/makefile.vc | 29 +++++++++ utils/wxrc/makefile.wat | 13 ++++ utils/wxrc/mondrian.ico | Bin 0 -> 766 bytes utils/wxrc/wxrc.cpp | 21 ++++++- utils/wxrc/wxrc.rc | 2 + 26 files changed, 393 insertions(+), 10 deletions(-) create mode 100644 contrib/utils/wxrc/makefile.b32 create mode 100644 contrib/utils/wxrc/makefile.g95 create mode 100644 contrib/utils/wxrc/makefile.vc create mode 100644 contrib/utils/wxrc/makefile.wat create mode 100644 contrib/utils/wxrc/mondrian.ico create mode 100644 contrib/utils/wxrc/wxrc.rc create mode 100644 contrib/utils/wxrcedit/makefile.b32 create mode 100644 contrib/utils/wxrcedit/makefile.g95 create mode 100644 contrib/utils/wxrcedit/makefile.vc create mode 100644 contrib/utils/wxrcedit/makefile.wat create mode 100644 contrib/utils/wxrcedit/mondrian.ico create mode 100644 contrib/utils/wxrcedit/wxrcedit.rc create mode 100644 distrib/msw/wxrc.rsp create mode 100644 utils/wxrc/makefile.b32 create mode 100644 utils/wxrc/makefile.g95 create mode 100644 utils/wxrc/makefile.vc create mode 100644 utils/wxrc/makefile.wat create mode 100644 utils/wxrc/mondrian.ico create mode 100644 utils/wxrc/wxrc.rc 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 0000000000000000000000000000000000000000..2310c5d275a87af295d5ea8dc79ea417a5e74c53 GIT binary patch literal 766 zcmZQzU<5)11px*Sc)`TLAO@s0fLH;D9e|jTfdxnc0ZSetToolBitmapSize(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 0000000000000000000000000000000000000000..2310c5d275a87af295d5ea8dc79ea417a5e74c53 GIT binary patch literal 766 zcmZQzU<5)11px*Sc)`TLAO@s0fLH;D9e|jTfdxnc0Z