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

WIN32 compilation of wxrc, wxrcedit

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2000-07-26 12:40:49 +00:00
parent 1126585b76
commit 031dfec8d4
26 changed files with 393 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
contrib/utils/wxrc/makefile.b32 Normal file
View File

@ -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

17
contrib/utils/wxrc/makefile.g95 Normal file
View File

@ -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

29
contrib/utils/wxrc/makefile.vc Normal file
View File

@ -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

13
contrib/utils/wxrc/makefile.wat Normal file
View File

@ -0,0 +1,13 @@
#
# Makefile for WATCOM
#
#
WXDIR = $(%WXWIN)
PROGRAM = wxrc
EXTRALIBS = $(WXDIR)\lib\wxxml.lib
OBJECTS = $(PROGRAM).obj
!include $(WXDIR)\src\makeprog.wat

BIN
contrib/utils/wxrc/mondrian.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 766 B

21
contrib/utils/wxrc/wxrc.cpp
View File

@ -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;
}
}

2
contrib/utils/wxrc/wxrc.rc Normal file
View File

@ -0,0 +1,2 @@
mondrian ICON "mondrian.ico"
#include "wx/msw/wx.rc"

11
contrib/utils/wxrcedit/editor.cpp
View File

@ -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,

11
contrib/utils/wxrcedit/editor.h
View File

@ -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;

17
contrib/utils/wxrcedit/makefile.b32 Normal file
View File

@ -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

16
contrib/utils/wxrcedit/makefile.g95 Normal file
View File

@ -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

29
contrib/utils/wxrcedit/makefile.vc Normal file
View File

@ -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

13
contrib/utils/wxrcedit/makefile.wat Normal file
View File

@ -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

BIN
contrib/utils/wxrcedit/mondrian.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 766 B

2
contrib/utils/wxrcedit/wxrcedit.rc Normal file
View File

@ -0,0 +1,2 @@
mondrian ICON "mondrian.ico"
#include "wx/msw/wx.rc"

8
distrib/msw/vc.rsp
View File

@ -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

90
distrib/msw/wxrc.rsp Normal file
View File

@ -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

4
src/wxvc.dsp
View File

@ -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

4
src/wxvc_dll.dsp
View File

@ -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

17
utils/wxrc/makefile.b32 Normal file
View File

@ -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

17
utils/wxrc/makefile.g95 Normal file
View File

@ -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

29
utils/wxrc/makefile.vc Normal file
View File

@ -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

13
utils/wxrc/makefile.wat Normal file
View File

@ -0,0 +1,13 @@
#
# Makefile for WATCOM
#
#
WXDIR = $(%WXWIN)
PROGRAM = wxrc
EXTRALIBS = $(WXDIR)\lib\wxxml.lib
OBJECTS = $(PROGRAM).obj
!include $(WXDIR)\src\makeprog.wat

BIN
utils/wxrc/mondrian.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 766 B

21
utils/wxrc/wxrc.cpp
View File

@ -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;
}
}

2
utils/wxrc/wxrc.rc Normal file
View File

@ -0,0 +1,2 @@
mondrian ICON "mondrian.ico"
#include "wx/msw/wx.rc"