Added bakefiles for contrib/utils/convertrc and contrib/utils/wxrcedit
and regenerated makefiles. various compilation and warning fixes for recent changes and for WXWIN_COMPATIBILITY_2_4==0. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
parent
e57f3c5d95
commit
c74caa095c
@ -16,6 +16,7 @@
|
||||
../../utils/*.bkl
|
||||
../../utils/*/*.bkl
|
||||
../../utils/*/*/*.bkl
|
||||
../../contrib/utils/*/*.bkl
|
||||
../../contrib/samples/*.bkl
|
||||
../../contrib/samples/*/*.bkl
|
||||
../../contrib/samples/*/*/*.bkl
|
||||
|
||||
@ -32,5 +32,8 @@
|
||||
<template id="wx_contrib_headers">
|
||||
<srcdir>$(CONTRIB_HDR_DIR)</srcdir>
|
||||
</template>
|
||||
|
||||
|
||||
<template id="wx_contrib_util" template="wx_util">
|
||||
<include>$(CONTRIB_HDR_DIR)</include>
|
||||
</template>
|
||||
</makefile>
|
||||
|
||||
@ -35,6 +35,8 @@
|
||||
#include <math.h>
|
||||
#include <string.h>
|
||||
|
||||
static inline wxChar* copystring(const wxChar* s)
|
||||
{ return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxPropertyValue, wxObject)
|
||||
|
||||
@ -1154,11 +1156,17 @@ wxChar *wxPropertyValidator::DoubleToString (double number) {
|
||||
}
|
||||
|
||||
wxChar *wxPropertyValidator::IntToString (int number) {
|
||||
return ::IntToString (number);
|
||||
static wxChar buf[20];
|
||||
|
||||
wxSprintf (buf, wxT("%d"), number);
|
||||
return buf;
|
||||
}
|
||||
|
||||
wxChar *wxPropertyValidator::LongToString (long number) {
|
||||
return ::LongToString (number);
|
||||
}
|
||||
static wxChar buf[20];
|
||||
|
||||
wxSprintf (buf, wxT("%ld"), number);
|
||||
return buf;
|
||||
}
|
||||
|
||||
#endif // wxUSE_PROPSHEET
|
||||
|
||||
@ -57,6 +57,9 @@
|
||||
#include <math.h>
|
||||
#include <string.h>
|
||||
|
||||
static inline wxChar* copystring(const wxChar* s)
|
||||
{ return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Property text edit control
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
@ -89,6 +89,9 @@
|
||||
#include "wx/deprecated/resource.h"
|
||||
#include "wx/deprecated/wxexpr.h"
|
||||
|
||||
static inline wxChar* copystring(const wxChar* s)
|
||||
{ return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
|
||||
|
||||
// Forward (private) declarations
|
||||
bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db);
|
||||
wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr, bool isPanel = FALSE);
|
||||
|
||||
@ -32,6 +32,9 @@
|
||||
#include "wx/deprecated/expr.h"
|
||||
#include "wx/deprecated/wxexpr.h"
|
||||
|
||||
static inline wxChar* copystring(const wxChar* s)
|
||||
{ return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
|
||||
|
||||
extern "C" void add_expr(char *);
|
||||
extern "C" void LexFromFile(FILE *fd);
|
||||
extern "C" void LexFromString(char *buf);
|
||||
|
||||
@ -1,14 +1,152 @@
|
||||
# $Id$
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
top_srcdir = @top_srcdir@/..
|
||||
top_builddir = ../../..
|
||||
program_dir = contrib/utils/convertrc
|
||||
|
||||
PROGRAM=convert
|
||||
@MAKE_SET@
|
||||
|
||||
APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_wxdeprecated-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
|
||||
APPEXTRADEFS=-I$(top_srcdir)/contrib/include
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
INSTALL = @INSTALL@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
EXEEXT = @EXEEXT@
|
||||
EXTRALIBS = @EXTRALIBS@
|
||||
EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
||||
EXTRALIBS_XML = @EXTRALIBS_XML@
|
||||
HOST_SUFFIX = @HOST_SUFFIX@
|
||||
INSTALL_DIR = @INSTALL_DIR@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LDFLAGS_GUI = @LDFLAGS_GUI@
|
||||
RESCOMP = @RESCOMP@
|
||||
SETFILE = @SETFILE@
|
||||
STRIP = @STRIP@
|
||||
TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
|
||||
TOOLKIT = @TOOLKIT@
|
||||
TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
|
||||
TOOLKIT_VERSION = @TOOLKIT_VERSION@
|
||||
bindir = @bindir@
|
||||
srcdir = @srcdir@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
|
||||
OBJECTS=convert.o rc2xml.o rc2wxr.o wxr2xml.o
|
||||
### Variables: ###
|
||||
|
||||
include $(top_builddir)/src/makeprog.env
|
||||
CONVERTRC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
|
||||
-I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CXXFLAGS)
|
||||
CONVERTRC_OBJECTS = \
|
||||
convertrc_convert.o \
|
||||
convertrc_rc2wxr.o \
|
||||
convertrc_rc2xml.o \
|
||||
convertrc_wxr2xml.o \
|
||||
$(__convertrc___win32rc)
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
@COND_DEPS_TRACKING_0@CXXC = $(CXX)
|
||||
@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
|
||||
@COND_USE_GUI_0@PORTNAME = base
|
||||
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
|
||||
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
|
||||
@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
|
||||
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
|
||||
@COND_UNICODE_1@WXUNICODEFLAG = u
|
||||
@COND_WXUNIV_1@WXUNIVNAME = univ
|
||||
@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
|
||||
@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
|
||||
@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
|
||||
@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
|
||||
@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
|
||||
@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
|
||||
@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
|
||||
@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
|
||||
@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
|
||||
@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
|
||||
@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
|
||||
@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
|
||||
@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
|
||||
@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
|
||||
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
|
||||
$(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \
|
||||
convertrc$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
|
||||
sample.r
|
||||
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
|
||||
@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
|
||||
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
|
||||
COND_MONOLITHIC_0___WXLIB_CORE_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
|
||||
COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
|
||||
@COND_MONOLITHIC_0@__WXLIB_XML_p = \
|
||||
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
|
||||
@COND_PLATFORM_MAC_1@__convertrc___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
|
||||
@COND_PLATFORM_MAC_1@__convertrc___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C convertrc$(EXEEXT)
|
||||
@COND_PLATFORM_WIN32_1@__convertrc___win32rc = convertrc_wxconvert_rc.o
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: convertrc$(EXEEXT)
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps ./.pch
|
||||
rm -f ./*.o
|
||||
rm -f convertrc$(EXEEXT)
|
||||
|
||||
convertrc$(EXEEXT): $(CONVERTRC_OBJECTS) $(__convertrc___win32rc)
|
||||
$(CXX) -o $@ $(CONVERTRC_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(__WXLIB_CORE_p) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(EXTRALIBS_XML) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
|
||||
$(__convertrc___mac_rezcmd)
|
||||
$(__convertrc___mac_setfilecmd)
|
||||
|
||||
convertrc_convert.o: $(srcdir)/convert.cpp
|
||||
$(CXXC) -c -o $@ $(CONVERTRC_CXXFLAGS) $<
|
||||
|
||||
convertrc_rc2wxr.o: $(srcdir)/rc2wxr.cpp
|
||||
$(CXXC) -c -o $@ $(CONVERTRC_CXXFLAGS) $<
|
||||
|
||||
convertrc_rc2xml.o: $(srcdir)/rc2xml.cpp
|
||||
$(CXXC) -c -o $@ $(CONVERTRC_CXXFLAGS) $<
|
||||
|
||||
convertrc_wxconvert_rc.o: $(srcdir)/wxconvert.rc
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include
|
||||
|
||||
convertrc_wxr2xml.o: $(srcdir)/wxr2xml.cpp
|
||||
$(CXXC) -c -o $@ $(CONVERTRC_CXXFLAGS) $<
|
||||
|
||||
distclean: clean
|
||||
rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
|
||||
|
||||
install: all install_convertrc
|
||||
|
||||
install-strip: install
|
||||
$(STRIP) $(bindir)/convertrc$(EXEEXT)
|
||||
|
||||
install_convertrc:
|
||||
$(INSTALL_DIR) $(bindir)
|
||||
$(INSTALL_PROGRAM) convertrc$(EXEEXT) $(bindir)
|
||||
|
||||
uninstall:
|
||||
|
||||
|
||||
# Include dependency info, if present:
|
||||
@IF_GNU_MAKE@-include .deps/*.d
|
||||
|
||||
.PHONY: all clean distclean install install_convertrc uninstall
|
||||
|
||||
23
contrib/utils/convertrc/convertrc.bkl
Normal file
23
contrib/utils/convertrc/convertrc.bkl
Normal file
@ -0,0 +1,23 @@
|
||||
<?xml version="1.0" ?>
|
||||
<makefile>
|
||||
|
||||
<include file="../../../build/bakefiles/common_samples.bkl"/>
|
||||
<include file="../../../build/bakefiles/common_contrib.bkl"/>
|
||||
|
||||
<exe id="convertrc" template="wx_contrib_util" template_append="wx_append">
|
||||
<sources>
|
||||
convert.cpp
|
||||
rc2wxr.cpp
|
||||
rc2xml.cpp
|
||||
wxr2xml.cpp
|
||||
</sources>
|
||||
<wx-lib>core</wx-lib>
|
||||
<wx-lib>deprecated</wx-lib>
|
||||
<wx-lib>xml</wx-lib>
|
||||
<wx-lib>base</wx-lib>
|
||||
<win32-res>wxconvert.rc</win32-res>
|
||||
<ldlibs>$(EXTRALIBS_XML)</ldlibs>
|
||||
<install-to>$(BINDIR)</install-to>
|
||||
</exe>
|
||||
|
||||
</makefile>
|
||||
@ -251,7 +251,7 @@ if (!tok.IsNumber())
|
||||
|
||||
//Generate Dialog text
|
||||
|
||||
fprintf(m_wxr,"static char *dialog%i = \"dialog(name = '%s',\\\n",dlgid,dlgname);
|
||||
fprintf(m_wxr,"static char *dialog%i = \"dialog(name = '%s',\\\n",dlgid,dlgname.c_str());
|
||||
|
||||
//be lazy about style for now. add it later
|
||||
|
||||
@ -295,7 +295,7 @@ if (tok=="CAPTION")
|
||||
|
||||
title=GetQuoteField();
|
||||
|
||||
fprintf(m_wxr,"title = '%s',\\\n",title);
|
||||
fprintf(m_wxr,"title = '%s',\\\n",title.c_str());
|
||||
|
||||
}
|
||||
|
||||
@ -413,7 +413,7 @@ int x,y,width,height;
|
||||
|
||||
ReadRect(x,y,width,height);
|
||||
|
||||
fprintf(m_wxr," control = [%i,wxStaticText,'%s','0','%s',",m_controlid,phrase,varname);
|
||||
fprintf(m_wxr," control = [%i,wxStaticText,'%s','0','%s',",m_controlid,phrase.c_str(),varname.c_str());
|
||||
|
||||
fprintf(m_wxr,"%i,%i,%i,%i,'',\\\n",x,y,width,height);
|
||||
|
||||
@ -439,7 +439,7 @@ int x,y,width,height;
|
||||
|
||||
ReadRect(x,y,width,height);
|
||||
|
||||
fprintf(m_wxr," control = [%i,wxTextCtrl,'','0','%s',",m_controlid,varname);
|
||||
fprintf(m_wxr," control = [%i,wxTextCtrl,'','0','%s',",m_controlid,varname.c_str());
|
||||
|
||||
fprintf(m_wxr,"%i,%i,%i,%i,'',\\\n",x,y,width,height);
|
||||
|
||||
@ -491,7 +491,7 @@ int x,y,width,height;
|
||||
|
||||
ReadRect(x,y,width,height);
|
||||
|
||||
fprintf(m_wxr," control = [%i,wxButton,'%s','0','%s',",c,phrase,varname);
|
||||
fprintf(m_wxr," control = [%i,wxButton,'%s','0','%s',",c,phrase.c_str(),varname.c_str());
|
||||
|
||||
fprintf(m_wxr,"%i,%i,%i,%i,'',\\\n",x,y,width,height);
|
||||
|
||||
@ -551,7 +551,7 @@ int x,y,width,height;
|
||||
|
||||
ReadRect(x,y,width,height);
|
||||
|
||||
fprintf(m_wxr," control = [%i,wxStaticBox,'%s','0','%s',",m_controlid,phrase,varname);
|
||||
fprintf(m_wxr," control = [%i,wxStaticBox,'%s','0','%s',",m_controlid,phrase.c_str(),varname.c_str());
|
||||
|
||||
fprintf(m_wxr,"%i,%i,%i,%i,'',\\\n",x,y,width,height);
|
||||
|
||||
@ -771,7 +771,7 @@ ReadRect(x,y,width,height);
|
||||
|
||||
|
||||
|
||||
fprintf(m_wxr," control = [%i,wxChoice,'','0','%s',",m_controlid,varname);
|
||||
fprintf(m_wxr," control = [%i,wxChoice,'','0','%s',",m_controlid,varname.c_str());
|
||||
|
||||
fprintf(m_wxr,"%i,%i,%i,%i,[],\\\n",x,y,width,height);
|
||||
|
||||
@ -795,7 +795,7 @@ static int menuid=0;
|
||||
|
||||
menuid++;
|
||||
|
||||
fprintf(m_wxr,"static char *MenuBar%i = \"menu(name = '%s',\\\n",menuid,name);
|
||||
fprintf(m_wxr,"static char *MenuBar%i = \"menu(name = '%s',\\\n",menuid,name.c_str());
|
||||
|
||||
fprintf(m_wxr,"menu = \\\n");
|
||||
|
||||
@ -857,7 +857,7 @@ spot=tok.First("\\t");
|
||||
|
||||
tok=tok.Left(spot);
|
||||
|
||||
fprintf(m_wxr," ['%s',%i,'',\\\n",tok,menuitem);
|
||||
fprintf(m_wxr," ['%s',%i,'',\\\n",tok.c_str(),menuitem);
|
||||
|
||||
while ((tok!="BEGIN")&(tok!="{"))
|
||||
|
||||
@ -893,7 +893,7 @@ tok=tok.Left(spot);
|
||||
|
||||
menuitem++;
|
||||
|
||||
fprintf(m_wxr," ['%s',%i,''],\\\n",tok,menuitem);
|
||||
fprintf(m_wxr," ['%s',%i,''],\\\n",tok.c_str(),menuitem);
|
||||
|
||||
}
|
||||
|
||||
@ -981,7 +981,7 @@ wxString tok;
|
||||
|
||||
while (ReadOrs(tok));
|
||||
|
||||
fprintf(m_wxr," control = [%i,wxSlider,'','wxSL_HORIZONTAL','%s',",m_controlid,varname);
|
||||
fprintf(m_wxr," control = [%i,wxSlider,'','wxSL_HORIZONTAL','%s',",m_controlid,varname.c_str());
|
||||
|
||||
int x,y,width,height;
|
||||
|
||||
@ -1011,7 +1011,7 @@ wxString tok;
|
||||
|
||||
while (ReadOrs(tok));
|
||||
|
||||
fprintf(m_wxr," control = [%i,wxGauge,'','wxGA_HORIZONTAL','%s',",m_controlid,varname);
|
||||
fprintf(m_wxr," control = [%i,wxGauge,'','wxGA_HORIZONTAL','%s',",m_controlid,varname.c_str());
|
||||
|
||||
int x,y,width,height;
|
||||
|
||||
@ -1069,7 +1069,7 @@ if (tok=="BS_AUTOCHECKBOX")
|
||||
|
||||
{
|
||||
|
||||
fprintf(m_wxr," control = [%i,wxCheckBox,'%s','0','%s',",m_controlid,label,varname);
|
||||
fprintf(m_wxr," control = [%i,wxCheckBox,'%s','0','%s',",m_controlid,label.c_str(),varname.c_str());
|
||||
|
||||
while (ReadOrs(tok));
|
||||
|
||||
@ -1087,7 +1087,7 @@ if (tok=="BS_AUTORADIOBUTTON")
|
||||
|
||||
{
|
||||
|
||||
fprintf(m_wxr," control = [%i,wxRadioButton,'%s','0','%s',",m_controlid,label,varname);
|
||||
fprintf(m_wxr," control = [%i,wxRadioButton,'%s','0','%s',",m_controlid,label.c_str(),varname.c_str());
|
||||
|
||||
while(ReadOrs(tok));
|
||||
|
||||
|
||||
@ -1,31 +1,186 @@
|
||||
# $Id$
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.1.1 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
top_srcdir = @top_srcdir@/..
|
||||
top_builddir = ../../..
|
||||
program_dir = contrib/utils/wxrcedit
|
||||
|
||||
PROGRAM=wxrcedit
|
||||
@MAKE_SET@
|
||||
|
||||
OBJECTS=edapp.o editor.o nodehnd.o xmlhelpr.o preview.o nodesdb.o \
|
||||
pe_basic.o pe_adv.o propedit.o propframe.o splittree.o
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
INSTALL = @INSTALL@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
EXEEXT = @EXEEXT@
|
||||
EXTRALIBS = @EXTRALIBS@
|
||||
EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
||||
EXTRALIBS_XML = @EXTRALIBS_XML@
|
||||
HOST_SUFFIX = @HOST_SUFFIX@
|
||||
INSTALL_DIR = @INSTALL_DIR@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LDFLAGS_GUI = @LDFLAGS_GUI@
|
||||
RESCOMP = @RESCOMP@
|
||||
SETFILE = @SETFILE@
|
||||
STRIP = @STRIP@
|
||||
TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
|
||||
TOOLKIT = @TOOLKIT@
|
||||
TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
|
||||
TOOLKIT_VERSION = @TOOLKIT_VERSION@
|
||||
bindir = @bindir@
|
||||
srcdir = @srcdir@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
|
||||
DATADIRS = df
|
||||
DATAFILES = df/break.df df/control.df df/menu_item.df df/notebookpage.df \
|
||||
df/panel_item.df df/panelbase.df df/separator.df df/sizer_item.df \
|
||||
df/sizeritem.df df/spacer.df df/tool.df df/toolbar_item.df \
|
||||
df/unknown.df df/window.df df/wxBitmapButton.df df/wxBoxSizer.df \
|
||||
df/wxButton.df df/wxCalendarCtrl.df df/wxCheckBox.df \
|
||||
df/wxCheckList.df df/wxChoice.df df/wxComboBox.df df/wxDialog.df \
|
||||
df/wxFlexGridSizer.df df/wxGauge.df df/wxGridSizer.df \
|
||||
df/wxHtmlWindow.df df/wxListBox.df df/wxListCtrl.df df/wxMenu.df \
|
||||
df/wxMenuBar.df df/wxMenuItem.df df/wxNotebook.df df/wxPanel.df \
|
||||
df/wxRadioBox.df df/wxRadioButton.df df/wxScrollBar.df \
|
||||
df/wxSlider.df df/wxSpinButton.df df/wxSpinCtrl.df \
|
||||
df/wxStaticBitmap.df df/wxStaticBox.df df/wxStaticBoxSizer.df \
|
||||
df/wxStaticLine.df df/wxStaticText.df df/wxTextCtrl.df \
|
||||
df/wxToolBar.df df/wxTreeCtrl.df df/wxFrame.df
|
||||
|
||||
APPEXTRALIBS=$(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_xrc-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@
|
||||
APPEXTRADEFS=-I$(top_srcdir)/contrib/include
|
||||
### Variables: ###
|
||||
|
||||
include $(top_builddir)/src/makeprog.env
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
WXRCEDIT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
|
||||
-I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CXXFLAGS)
|
||||
WXRCEDIT_OBJECTS = \
|
||||
wxrcedit_edapp.o \
|
||||
wxrcedit_editor.o \
|
||||
wxrcedit_nodehnd.o \
|
||||
wxrcedit_nodesdb.o \
|
||||
wxrcedit_pe_adv.o \
|
||||
wxrcedit_pe_basic.o \
|
||||
wxrcedit_preview.o \
|
||||
wxrcedit_propedit.o \
|
||||
wxrcedit_propframe.o \
|
||||
wxrcedit_splittree.o \
|
||||
wxrcedit_xmlhelpr.o \
|
||||
$(__wxrcedit___win32rc)
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
@COND_DEPS_TRACKING_0@CXXC = $(CXX)
|
||||
@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
|
||||
@COND_USE_GUI_0@PORTNAME = base
|
||||
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
|
||||
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
|
||||
@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
|
||||
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
|
||||
@COND_UNICODE_1@WXUNICODEFLAG = u
|
||||
@COND_WXUNIV_1@WXUNIVNAME = univ
|
||||
@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
|
||||
@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
|
||||
@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
|
||||
@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
|
||||
@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
|
||||
@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
|
||||
@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
|
||||
@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
|
||||
@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
|
||||
@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
|
||||
@COND_WXUSE_REGEX_BUILTIN@ -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
|
||||
@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
|
||||
@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
|
||||
@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
|
||||
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
|
||||
$(__DLLFLAG_p_1) -i $(srcdir)/../../../samples -i $(srcdir)/../../include -o \
|
||||
wxrcedit$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
|
||||
sample.r
|
||||
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
|
||||
COND_MONOLITHIC_0___WXLIB_ADV_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
|
||||
@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
|
||||
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
|
||||
COND_MONOLITHIC_0___WXLIB_CORE_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
|
||||
COND_MONOLITHIC_0___WXLIB_HTML_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
|
||||
COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
|
||||
@COND_MONOLITHIC_0@__WXLIB_XML_p = \
|
||||
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
|
||||
@COND_PLATFORM_MAC_1@__wxrcedit___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
|
||||
@COND_PLATFORM_MAC_1@__wxrcedit___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C wxrcedit$(EXEEXT)
|
||||
@COND_PLATFORM_WIN32_1@__wxrcedit___win32rc = wxrcedit_wxrcedit_rc.o
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: wxrcedit$(EXEEXT)
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps ./.pch
|
||||
rm -f ./*.o
|
||||
rm -f wxrcedit$(EXEEXT)
|
||||
|
||||
distclean: clean
|
||||
rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
|
||||
|
||||
install: all install_wxrcedit
|
||||
|
||||
install-strip: install
|
||||
$(STRIP) $(bindir)/wxrcedit$(EXEEXT)
|
||||
|
||||
install_wxrcedit:
|
||||
$(INSTALL_DIR) $(bindir)
|
||||
$(INSTALL_PROGRAM) wxrcedit$(EXEEXT) $(bindir)
|
||||
|
||||
uninstall:
|
||||
|
||||
wxrcedit$(EXEEXT): $(WXRCEDIT_OBJECTS) $(__wxrcedit___win32rc)
|
||||
$(CXX) -o $@ $(WXRCEDIT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p) $(EXTRALIBS_XML) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
|
||||
$(__wxrcedit___mac_rezcmd)
|
||||
$(__wxrcedit___mac_setfilecmd)
|
||||
|
||||
wxrcedit_edapp.o: $(srcdir)/edapp.cpp
|
||||
$(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
|
||||
|
||||
wxrcedit_editor.o: $(srcdir)/editor.cpp
|
||||
$(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
|
||||
|
||||
wxrcedit_nodehnd.o: $(srcdir)/nodehnd.cpp
|
||||
$(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
|
||||
|
||||
wxrcedit_nodesdb.o: $(srcdir)/nodesdb.cpp
|
||||
$(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
|
||||
|
||||
wxrcedit_pe_adv.o: $(srcdir)/pe_adv.cpp
|
||||
$(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
|
||||
|
||||
wxrcedit_pe_basic.o: $(srcdir)/pe_basic.cpp
|
||||
$(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
|
||||
|
||||
wxrcedit_preview.o: $(srcdir)/preview.cpp
|
||||
$(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
|
||||
|
||||
wxrcedit_propedit.o: $(srcdir)/propedit.cpp
|
||||
$(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
|
||||
|
||||
wxrcedit_propframe.o: $(srcdir)/propframe.cpp
|
||||
$(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
|
||||
|
||||
wxrcedit_splittree.o: $(srcdir)/splittree.cpp
|
||||
$(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
|
||||
|
||||
wxrcedit_wxrcedit_rc.o: $(srcdir)/wxrcedit.rc
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include
|
||||
|
||||
wxrcedit_xmlhelpr.o: $(srcdir)/xmlhelpr.cpp
|
||||
$(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<
|
||||
|
||||
|
||||
# Include dependency info, if present:
|
||||
@IF_GNU_MAKE@-include .deps/*.d
|
||||
|
||||
.PHONY: all clean distclean install install_wxrcedit uninstall
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
#include "wx/wx.h"
|
||||
#endif
|
||||
|
||||
#include "wx/xrc/xml.h"
|
||||
#include "wx/xml/xml.h"
|
||||
#include "wx/image.h"
|
||||
#include "wx/wx.h"
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
#endif
|
||||
|
||||
#include "wx/wx.h"
|
||||
#include "wx/xrc/xml.h"
|
||||
#include "wx/xml/xml.h"
|
||||
#include "wx/xrc/xmlres.h"
|
||||
#include "wx/splitter.h"
|
||||
#include "wx/config.h"
|
||||
@ -396,7 +396,7 @@ void EditorFrame::RefreshTree()
|
||||
static void RecursivelyExpand(wxTreeCtrl *t, wxTreeItemId item)
|
||||
{
|
||||
t->Expand(item);
|
||||
long cookie;
|
||||
void* cookie;
|
||||
wxTreeItemId id = t->GetFirstChild(item, cookie);
|
||||
while (id.IsOk())
|
||||
{
|
||||
@ -416,7 +416,7 @@ bool EditorFrame::SelectNode(wxXmlNode *node, wxTreeItemId *root)
|
||||
wxTreeItemId item;
|
||||
XmlTreeData *dt;
|
||||
wxXmlNode *nd;
|
||||
long cookie;
|
||||
void* cookie;
|
||||
|
||||
item = m_TreeCtrl->GetFirstChild(*root, cookie);
|
||||
while (item.IsOk())
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
#endif
|
||||
|
||||
#include "nodehnd.h"
|
||||
#include "wx/xrc/xml.h"
|
||||
#include "wx/xml/xml.h"
|
||||
#include "wx/filefn.h"
|
||||
#include "wx/wx.h"
|
||||
#include "wx/arrimpl.cpp"
|
||||
|
||||
@ -22,9 +22,9 @@ class WXDLLEXPORT wxListCtrl;
|
||||
class EditorFrame;
|
||||
|
||||
#include "wx/treectrl.h"
|
||||
#include "wx/xrc/xml.h"
|
||||
#include "wx/xml/xml.h"
|
||||
#include "nodesdb.h"
|
||||
|
||||
#include "wx/arrstr.h"
|
||||
|
||||
|
||||
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
#define _NODESDB_H_
|
||||
|
||||
#include "wx/dynarray.h"
|
||||
#include "wx/arrstr.h"
|
||||
|
||||
class WXDLLEXPORT wxXmlNode;
|
||||
class WXDLLEXPORT wxString;
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
#endif
|
||||
|
||||
#include "wx/wx.h"
|
||||
#include "wx/xrc/xml.h"
|
||||
#include "wx/xml/xml.h"
|
||||
#include "wx/tokenzr.h"
|
||||
#include "wx/wx.h"
|
||||
#include "wx/dialog.h"
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
#endif
|
||||
|
||||
#include "wx/wx.h"
|
||||
#include "wx/xrc/xml.h"
|
||||
#include "wx/xml/xml.h"
|
||||
#include "wx/tokenzr.h"
|
||||
#include "pe_basic.h"
|
||||
#include "xmlhelpr.h"
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
#endif
|
||||
|
||||
#include "wx/wx.h"
|
||||
#include "wx/xrc/xml.h"
|
||||
#include "wx/xml/xml.h"
|
||||
#include "wx/xrc/xmlres.h"
|
||||
#include "wx/config.h"
|
||||
#include "wx/log.h"
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
#endif
|
||||
|
||||
#include "wx/wx.h"
|
||||
#include "wx/xrc/xml.h"
|
||||
#include "wx/xml/xml.h"
|
||||
#include "propframe.h"
|
||||
#include "propedit.h"
|
||||
#include "xmlhelpr.h"
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
#endif
|
||||
|
||||
#include "wx/wx.h"
|
||||
#include "wx/xrc/xml.h"
|
||||
#include "wx/xml/xml.h"
|
||||
#include "wx/config.h"
|
||||
#include "splittree.h"
|
||||
#include "xmlhelpr.h"
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
// ----------------------------------------------------------------------------
|
||||
// headers
|
||||
// ----------------------------------------------------------------------------
|
||||
#ifdef __GNUG__
|
||||
#if defined(__GNUG__) && !defined(__APPLE__)
|
||||
#pragma implementation "splittree.h"
|
||||
#endif
|
||||
|
||||
@ -332,9 +332,9 @@ void wxRemotelyScrolledTreeCtrl::CalcTreeSize(const wxTreeItemId& id, wxRect& re
|
||||
rect = CombineRectangles(rect, itemSize);
|
||||
}
|
||||
|
||||
long cookie;
|
||||
void* cookie;
|
||||
wxTreeItemId childId = GetFirstChild(id, cookie);
|
||||
while (childId != 0)
|
||||
while (childId)
|
||||
{
|
||||
CalcTreeSize(childId, rect);
|
||||
childId = GetNextChild(childId, cookie);
|
||||
@ -495,6 +495,10 @@ wxThinSplitterWindow::wxThinSplitterWindow(wxWindow* parent, wxWindowID id,
|
||||
{
|
||||
}
|
||||
|
||||
wxThinSplitterWindow::~wxThinSplitterWindow()
|
||||
{
|
||||
}
|
||||
|
||||
void wxThinSplitterWindow::SizeWindows()
|
||||
{
|
||||
// The client size may have changed inbetween
|
||||
@ -512,7 +516,7 @@ bool wxThinSplitterWindow::SashHitTest(int x, int y, int tolerance)
|
||||
|
||||
void wxThinSplitterWindow::DrawSash(wxDC& dc)
|
||||
{
|
||||
if ( m_sashPosition == 0 || !m_windowTwo)
|
||||
if ( GetSashPosition() == 0 || !m_windowTwo)
|
||||
return;
|
||||
if (GetWindowStyle() & wxSP_NOSASH)
|
||||
return;
|
||||
@ -532,7 +536,7 @@ void wxThinSplitterWindow::DrawSash(wxDC& dc)
|
||||
{
|
||||
y1 = 2; h1 -= 3;
|
||||
}
|
||||
dc.DrawRectangle(m_sashPosition, y1, m_sashSize, h1);
|
||||
dc.DrawRectangle(GetSashPosition(), y1, GetSashSize(), h1);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -546,7 +550,7 @@ void wxThinSplitterWindow::DrawSash(wxDC& dc)
|
||||
{
|
||||
x1 = 2; w1 -= 3;
|
||||
}
|
||||
dc.DrawRectangle(x1, m_sashPosition, w1, m_sashSize);
|
||||
dc.DrawRectangle(x1, GetSashPosition(), w1, GetSashSize());
|
||||
}
|
||||
|
||||
dc.SetPen(wxNullPen);
|
||||
|
||||
@ -166,6 +166,7 @@ public:
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& sz = wxDefaultSize,
|
||||
long style = wxSP_3D | wxCLIP_CHILDREN);
|
||||
~wxThinSplitterWindow();
|
||||
|
||||
//// Overrides
|
||||
|
||||
|
||||
32
contrib/utils/wxrcedit/wxrcedit.bkl
Normal file
32
contrib/utils/wxrcedit/wxrcedit.bkl
Normal file
@ -0,0 +1,32 @@
|
||||
<?xml version="1.0" ?>
|
||||
<makefile>
|
||||
|
||||
<include file="../../../build/bakefiles/common_samples.bkl"/>
|
||||
<include file="../../../build/bakefiles/common_contrib.bkl"/>
|
||||
|
||||
<exe id="wxrcedit" template="wx_contrib_util" template_append="wx_append">
|
||||
<sources>
|
||||
edapp.cpp
|
||||
editor.cpp
|
||||
nodehnd.cpp
|
||||
nodesdb.cpp
|
||||
pe_adv.cpp
|
||||
pe_basic.cpp
|
||||
preview.cpp
|
||||
propedit.cpp
|
||||
propframe.cpp
|
||||
splittree.cpp
|
||||
xmlhelpr.cpp
|
||||
</sources>
|
||||
<wx-lib>xrc</wx-lib>
|
||||
<wx-lib>adv</wx-lib>
|
||||
<wx-lib>html</wx-lib>
|
||||
<wx-lib>core</wx-lib>
|
||||
<wx-lib>xml</wx-lib>
|
||||
<wx-lib>base</wx-lib>
|
||||
<win32-res>wxrcedit.rc</win32-res>
|
||||
<ldlibs>$(EXTRALIBS_XML)</ldlibs>
|
||||
<install-to>$(BINDIR)</install-to>
|
||||
</exe>
|
||||
|
||||
</makefile>
|
||||
@ -17,7 +17,7 @@
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#include "wx/xrc/xml.h"
|
||||
#include "wx/xml/xml.h"
|
||||
#include "wx/wx.h"
|
||||
#include "wx/tokenzr.h"
|
||||
#include "xmlhelpr.h"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user