[SCM] Packaging for DFArc branch, master, updated. debian/3.6-1-1-g340f7c8
Sylvain Beucler
beuc at beuc.net
Sun Feb 21 22:02:20 UTC 2010
The following commit has been merged in the master branch:
commit 340f7c85db31279969d4a9d3d4fdb958b9fd1e17
Author: Sylvain Beucler <beuc at beuc.net>
Date: Sun Feb 21 22:48:45 2010 +0100
Fix debhelper-but-no-misc-depends freedink-dfarc-dbg
diff --git a/autotools/config.guess b/autotools/config.guess
index f32079a..e3a2116 100755
--- a/autotools/config.guess
+++ b/autotools/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
# Free Software Foundation, Inc.
-timestamp='2008-01-23'
+timestamp='2009-06-10'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep __ELF__ >/dev/null
+ | grep -q __ELF__
then
# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
# Return netbsd for either. FIX?
@@ -324,6 +324,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
+ s390x:SunOS:*:*)
+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
@@ -331,7 +334,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ eval $set_cc_for_build
+ SUN_ARCH="i386"
+ # If there is a compiler, see if it is configured for 64-bit objects.
+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+ # This test works for both compilers.
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ SUN_ARCH="x86_64"
+ fi
+ fi
+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
@@ -640,7 +656,7 @@ EOF
# => hppa64-hp-hpux11.23
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
- grep __LP64__ >/dev/null
+ grep -q __LP64__
then
HP_ARCH="hppa2.0w"
else
@@ -796,7 +812,7 @@ EOF
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
- EM64T | authenticamd)
+ EM64T | authenticamd | genuineintel)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
@@ -806,6 +822,9 @@ EOF
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
+ 8664:Windows_NT:*)
+ echo x86_64-pc-mks
+ exit ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -866,40 +885,17 @@ EOF
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
- mips:Linux:*:*)
+ mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#undef CPU
- #undef mips
- #undef mipsel
+ #undef ${UNAME_MACHINE}
+ #undef ${UNAME_MACHINE}el
#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mipsel
+ CPU=${UNAME_MACHINE}el
#else
#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips
- #else
- CPU=
- #endif
- #endif
-EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^CPU/{
- s: ::g
- p
- }'`"
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
- #undef mips64
- #undef mips64el
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mips64el
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips64
+ CPU=${UNAME_MACHINE}
#else
CPU=
#endif
@@ -931,10 +927,13 @@ EOF
EV67) UNAME_MACHINE=alphaev67 ;;
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+ objdump --private-headers /bin/sh | grep -q ld.so.1
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
exit ;;
+ padre:Linux:*:*)
+ echo sparc-unknown-linux-gnu
+ exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -982,17 +981,6 @@ EOF
elf32-i386)
TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
;;
- a.out-i386-linux)
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit ;;
- coff-i386)
- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- exit ;;
- "")
- # Either a pre-BFD a.out linker (linux-gnuoldld) or
- # one that does not give us useful --help.
- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- exit ;;
esac
# Determine whether the default compiler is a.out or elf
eval $set_cc_for_build
@@ -1058,7 +1046,7 @@ EOF
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
@@ -1102,8 +1090,11 @@ EOF
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i386.
- echo i386-pc-msdosdjgpp
+ # the processor, so we play safe by assuming i586.
+ # Note: whatever this is, it MUST be the same as what config.sub
+ # prints for the "djgpp" host, or else GDB configury will decide that
+ # this is a cross-build.
+ echo i586-pc-msdosdjgpp
exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
@@ -1141,6 +1132,16 @@ EOF
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& { echo i486-ncr-sysv4; exit; } ;;
+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+ OS_REL='.3'
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
exit ;;
@@ -1153,7 +1154,7 @@ EOF
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
@@ -1216,6 +1217,9 @@ EOF
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
echo i586-pc-beos
exit ;;
+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
+ echo i586-pc-haiku
+ exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
exit ;;
@@ -1324,6 +1328,9 @@ EOF
i*86:rdos:*:*)
echo ${UNAME_MACHINE}-pc-rdos
exit ;;
+ i*86:AROS:*:*)
+ echo ${UNAME_MACHINE}-pc-aros
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
diff --git a/autotools/config.sub b/autotools/config.sub
index 6759825..eb0389a 100755
--- a/autotools/config.sub
+++ b/autotools/config.sub
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
# Free Software Foundation, Inc.
-timestamp='2008-01-16'
+timestamp='2009-06-11'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -122,6 +122,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -152,6 +153,9 @@ case $os in
os=
basic_machine=$1
;;
+ -bluegene*)
+ os=-cnk
+ ;;
-sim | -cisco | -oki | -wec | -winbond)
os=
basic_machine=$1
@@ -249,13 +253,16 @@ case $basic_machine in
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
+ | lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep \
+ | maxq | mb | microblaze | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
- | mips64vr | mips64vrel \
+ | mips64octeon | mips64octeonel \
| mips64orion | mips64orionel \
+ | mips64r5900 | mips64r5900el \
+ | mips64vr | mips64vrel \
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
@@ -268,6 +275,7 @@ case $basic_machine in
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+ | moxie \
| mt \
| msp430 \
| nios | nios2 \
@@ -277,7 +285,7 @@ case $basic_machine in
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
| score \
- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -286,7 +294,7 @@ case $basic_machine in
| v850 | v850e \
| we32k \
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
- | z8k)
+ | z8k | z80)
basic_machine=$basic_machine-unknown
;;
m6811 | m68hc11 | m6812 | m68hc12)
@@ -329,14 +337,17 @@ case $basic_machine in
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
+ | lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
- | mips64vr-* | mips64vrel-* \
+ | mips64octeon-* | mips64octeonel-* \
| mips64orion-* | mips64orionel-* \
+ | mips64r5900-* | mips64r5900el-* \
+ | mips64vr-* | mips64vrel-* \
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
@@ -358,20 +369,20 @@ case $basic_machine in
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa*-* \
| ymp-* \
- | z8k-*)
+ | z8k-* | z80-*)
;;
# Recognize the basic CPU types without company name, with glob match.
xtensa*)
@@ -439,6 +450,10 @@ case $basic_machine in
basic_machine=m68k-apollo
os=-bsd
;;
+ aros)
+ basic_machine=i386-pc
+ os=-aros
+ ;;
aux)
basic_machine=m68k-apple
os=-aux
@@ -455,10 +470,18 @@ case $basic_machine in
basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
os=-linux
;;
+ bluegene*)
+ basic_machine=powerpc-ibm
+ os=-cnk
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
;;
+ cegcc)
+ basic_machine=arm-unknown
+ os=-cegcc
+ ;;
convex-c1)
basic_machine=c1-convex
os=-bsd
@@ -526,6 +549,10 @@ case $basic_machine in
basic_machine=m88k-motorola
os=-sysv3
;;
+ dicos)
+ basic_machine=i686-pc
+ os=-dicos
+ ;;
djgpp)
basic_machine=i586-pc
os=-msdosdjgpp
@@ -1128,6 +1155,10 @@ case $basic_machine in
basic_machine=z8k-unknown
os=-sim
;;
+ z80-*-coff)
+ basic_machine=z80-unknown
+ os=-sim
+ ;;
none)
basic_machine=none-none
os=-none
@@ -1166,7 +1197,7 @@ case $basic_machine in
we32k)
basic_machine=we32k-att
;;
- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1236,10 +1267,11 @@ case $os in
# Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+ | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* \
+ | -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1248,7 +1280,7 @@ case $os in
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
+ | -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1388,6 +1420,9 @@ case $os in
-zvmoe)
os=-zvmoe
;;
+ -dicos*)
+ os=-dicos
+ ;;
-none)
;;
*)
@@ -1585,7 +1620,7 @@ case $basic_machine in
-sunos*)
vendor=sun
;;
- -aix*)
+ -cnk*|-aix*)
vendor=ibm
;;
-beos*)
diff --git a/debian/changelog b/debian/changelog
index 36ca5ba..a4e54c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
freedink-dfarc (3.6-1) unstable; urgency=low
* New Upstream Version
+ * Update years in debian/copyright and add translations information
+ * Bump Standards-Version to 3.8.4
+ * Fix debhelper-but-no-misc-depends by adding ${misc:Depends} in binary
+ packages dependencies
- -- Sylvain Beucler <beuc at beuc.net> Sun, 21 Feb 2010 22:37:07 +0100
+ -- Sylvain Beucler <beuc at beuc.net> Sun, 21 Feb 2010 22:53:28 +0100
freedink-dfarc (3.4-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index f8340c7..671b709 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Description: frontend and .dmod installer for GNU FreeDink
Package: freedink-dfarc-dbg
Section: debug
Architecture: any
-Depends: freedink-dfarc (= ${binary:Version})
+Depends: ${misc:Depends}, freedink-dfarc (= ${binary:Version})
Description: debugging symbols for dfarc
DFArc2 makes it easy to play and manage the Dink Smallwood game and
it's numerous Dink Modules (or D-Mods).
diff --git a/src/DFArcFrame_Base.cpp b/src/DFArcFrame_Base.cpp
deleted file mode 100644
index f90c973..0000000
--- a/src/DFArcFrame_Base.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-// -*- C++ -*- generated by wxGlade 0.6.3 on Sun Feb 21 21:08:09 2010
-
-#include "DFArcFrame_Base.h"
-
-// begin wxGlade: ::extracode
-// end wxGlade
-
-
-
-DFArcFrame_Base::DFArcFrame_Base(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
- wxFrame(parent, id, title, pos, size, wxDEFAULT_FRAME_STYLE)
-{
- // begin wxGlade: DFArcFrame_Base::DFArcFrame_Base
- mSplitter = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_LIVE_UPDATE|wxCLIP_CHILDREN);
- panel_1 = new wxPanel(mSplitter, wxID_ANY);
- lMenuBar = new wxMenuBar();
- wxMenu* lFileMenu = new wxMenu();
- lFileMenu->Append(ID_FileInstall, _("&Open D-Mod to Install"), _("Select a D-Mod to install"), wxITEM_NORMAL);
- lFileMenu->Append(ID_Download, _("&Download D-Mods"), _("Go to The Dink Network to download some D-Mods!"), wxITEM_NORMAL);
- lFileMenu->AppendSeparator();
- lFileMenu->Append(wxID_EXIT, _("E&xit"), _("Exit DFArc"), wxITEM_NORMAL);
- lMenuBar->Append(lFileMenu, _("&File"));
- wxMenu* lEditMenu = new wxMenu();
- lEditMenu->Append(ID_Refresh, _("&Refresh D-Mod List"), _("Refreshes the D-Mod list for any new additions"), wxITEM_NORMAL);
- lEditMenu->Append(ID_Browse, _("&Browse Selected D-Mod Directory"), _("Browse to the directory containing the current D-Mod"), wxITEM_NORMAL);
- lEditMenu->Append(ID_Uninstall, _("&Uninstall Selected D-Mod"), _("Uninstalls the selected D-Mod"), wxITEM_NORMAL);
- lEditMenu->AppendSeparator();
- lEditMenu->Append(ID_Options, _("&Options"), _("View or modify DFArc options"), wxITEM_NORMAL);
- lMenuBar->Append(lEditMenu, _("&Edit"));
- wxMenu* lHelpMenu = new wxMenu();
- lHelpMenu->Append(ID_IntroductionText, _("&Introduction"), _("A quick introduction to Dinking and D-Mods"), wxITEM_NORMAL);
- lHelpMenu->Append(ID_Walkthroughs, _("&Walkthroughs and Guides"), _("Stuck in a D-Mod? Check out The Dink Smallwood Solutions."), wxITEM_NORMAL);
- lHelpMenu->Append(ID_Forums, _("&Forums"), _("Ask a question on the forums, or see if someone had the same problem."), wxITEM_NORMAL);
- lHelpMenu->AppendSeparator();
- lHelpMenu->Append(wxID_ABOUT, _("&About"), _("About DFArc"), wxITEM_NORMAL);
- lMenuBar->Append(lHelpMenu, _("&Help"));
- SetMenuBar(lMenuBar);
- mStatusBar = CreateStatusBar(1, wxST_SIZEGRIP);
- const wxString *mDModListBox_choices = NULL;
- mDModListBox = new wxListBox(panel_1, ID_DmodTitleList, wxDefaultPosition, wxDefaultSize, 0, mDModListBox_choices, wxLB_SINGLE|wxLB_NEEDED_SB|wxLB_SORT);
- mPlayButton = new wxButton(panel_1, ID_Play, _("Play"));
- mTrueColor = new wxCheckBox(panel_1, ID_Truecolor, _("True Color"));
- mWindowed = new wxCheckBox(panel_1, ID_Windowed, _("Windowed"));
- mSound = new wxCheckBox(panel_1, ID_Sound, _("Sound"));
- mJoystick = new wxCheckBox(panel_1, ID_Joystick, _("Joystick"));
- mDebug = new wxCheckBox(panel_1, ID_Debug, _("Debug"));
- mV107 = new wxCheckBox(panel_1, ID_V107, _("v1.07 mode"));
- mEditButton = new wxButton(panel_1, ID_Edit, _("Edit"));
- mPackageButton = new wxButton(panel_1, ID_Package, _("Package"));
- mLogoButton = new wxStaticBitmap(panel_1, wxID_ANY, wxNullBitmap);
- mDmodDescription = new wxTextCtrl(mSplitter, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY);
-
- set_properties();
- do_layout();
- // end wxGlade
-}
-
-
-void DFArcFrame_Base::set_properties()
-{
- // begin wxGlade: DFArcFrame_Base::set_properties
- SetTitle(_("DFArc v3"));
- int mStatusBar_widths[] = { -1 };
- mStatusBar->SetStatusWidths(1, mStatusBar_widths);
- const wxString mStatusBar_fields[] = {
- wxEmptyString
- };
- for(int i = 0; i < mStatusBar->GetFieldsCount(); ++i) {
- mStatusBar->SetStatusText(mStatusBar_fields[i], i);
- }
- mPlayButton->SetDefault();
- mV107->SetToolTip(_("v1.07 compatibility mode, for D-Mods released before 2006"));
- mLogoButton->SetMinSize(wxSize(160, 120));
- // end wxGlade
-}
-
-
-void DFArcFrame_Base::do_layout()
-{
- // begin wxGlade: DFArcFrame_Base::do_layout
- wxBoxSizer* bg_color_sizer = new wxBoxSizer(wxHORIZONTAL);
- wxBoxSizer* lTopSizer = new wxBoxSizer(wxHORIZONTAL);
- wxBoxSizer* mImageSizer = new wxBoxSizer(wxVERTICAL);
- wxBoxSizer* mButtonSizer = new wxBoxSizer(wxHORIZONTAL);
- wxBoxSizer* lPlaySizer = new wxBoxSizer(wxVERTICAL);
- lTopSizer->Add(mDModListBox, 1, wxLEFT|wxEXPAND|wxADJUST_MINSIZE, 0);
- lPlaySizer->Add(mPlayButton, 0, wxBOTTOM|wxADJUST_MINSIZE, 10);
- lPlaySizer->Add(mTrueColor, 0, wxBOTTOM|wxADJUST_MINSIZE, 7);
- lPlaySizer->Add(mWindowed, 0, wxBOTTOM|wxADJUST_MINSIZE, 7);
- lPlaySizer->Add(mSound, 0, wxBOTTOM|wxADJUST_MINSIZE, 7);
- lPlaySizer->Add(mJoystick, 0, wxBOTTOM|wxADJUST_MINSIZE, 7);
- lPlaySizer->Add(mDebug, 0, wxBOTTOM|wxADJUST_MINSIZE, 7);
- lPlaySizer->Add(mV107, 0, wxBOTTOM|wxADJUST_MINSIZE, 7);
- lTopSizer->Add(lPlaySizer, 0, wxLEFT|wxEXPAND, 10);
- mButtonSizer->Add(mEditButton, 0, wxLEFT|wxADJUST_MINSIZE, 10);
- mButtonSizer->Add(mPackageButton, 0, wxLEFT|wxADJUST_MINSIZE, 10);
- mImageSizer->Add(mButtonSizer, 0, wxBOTTOM|wxEXPAND, 10);
- mImageSizer->Add(mLogoButton, 0, wxLEFT|wxALIGN_BOTTOM|wxALIGN_CENTER_HORIZONTAL|wxADJUST_MINSIZE, 10);
- lTopSizer->Add(mImageSizer, 0, wxLEFT|wxEXPAND, 10);
- panel_1->SetSizer(lTopSizer);
- mSplitter->SplitHorizontally(panel_1, mDmodDescription);
- bg_color_sizer->Add(mSplitter, 1, wxEXPAND, 0);
- SetSizer(bg_color_sizer);
- bg_color_sizer->Fit(this);
- Layout();
- // end wxGlade
-}
-
diff --git a/src/DFArcFrame_Base.h b/src/DFArcFrame_Base.h
deleted file mode 100644
index 857928d..0000000
--- a/src/DFArcFrame_Base.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// -*- C++ -*- generated by wxGlade 0.6.3 on Sun Feb 21 21:08:09 2010
-
-#include <wx/wx.h>
-#include <wx/image.h>
-// begin wxGlade: ::dependencies
-#include <wx/splitter.h>
-// end wxGlade
-
-
-#ifndef DFARCFRAME_BASE_H
-#define DFARCFRAME_BASE_H
-
-
-// begin wxGlade: ::extracode
-// end wxGlade
-
-
-class DFArcFrame_Base: public wxFrame {
-public:
- // begin wxGlade: DFArcFrame_Base::ids
- enum {
- ID_FileInstall = wxID_HIGHEST + 1009,
- ID_Download = wxID_HIGHEST + 1010,
- ID_Refresh = wxID_HIGHEST + 1011,
- ID_Browse = wxID_HIGHEST + 1012,
- ID_Uninstall = wxID_HIGHEST + 1013,
- ID_Options = wxID_HIGHEST + 1014,
- ID_IntroductionText = wxID_HIGHEST + 1015,
- ID_Walkthroughs = wxID_HIGHEST + 1016,
- ID_Forums = wxID_HIGHEST + 1017,
- ID_DmodTitleList = wxID_HIGHEST + 1027,
- ID_Play = wxID_HIGHEST + 1028,
- ID_Truecolor = wxID_HIGHEST + 1029,
- ID_Windowed = wxID_HIGHEST + 1030,
- ID_Sound = wxID_HIGHEST + 1031,
- ID_Joystick = wxID_HIGHEST + 1032,
- ID_Debug = wxID_HIGHEST + 1033,
- ID_V107 = wxID_HIGHEST + 1034,
- ID_Edit = wxID_HIGHEST + 1035,
- ID_Package = wxID_HIGHEST + 1036
- };
- // end wxGlade
-
- DFArcFrame_Base(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_FRAME_STYLE);
-
-private:
- // begin wxGlade: DFArcFrame_Base::methods
- void set_properties();
- void do_layout();
- // end wxGlade
-
-protected:
- // begin wxGlade: DFArcFrame_Base::attributes
- wxMenuBar* lMenuBar;
- wxStatusBar* mStatusBar;
- wxListBox* mDModListBox;
- wxButton* mPlayButton;
- wxCheckBox* mTrueColor;
- wxCheckBox* mWindowed;
- wxCheckBox* mSound;
- wxCheckBox* mJoystick;
- wxCheckBox* mDebug;
- wxCheckBox* mV107;
- wxButton* mEditButton;
- wxButton* mPackageButton;
- wxStaticBitmap* mLogoButton;
- wxPanel* panel_1;
- wxTextCtrl* mDmodDescription;
- wxSplitterWindow* mSplitter;
- // end wxGlade
-}; // wxGlade: end class
-
-
-#endif // DFARCFRAME_BASE_H
diff --git a/src/InstallVerifyFrame_Base.cpp b/src/InstallVerifyFrame_Base.cpp
deleted file mode 100644
index 6158c31..0000000
--- a/src/InstallVerifyFrame_Base.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-// -*- C++ -*- generated by wxGlade 0.6.3 on Sun Feb 21 21:08:10 2010
-
-#include "InstallVerifyFrame_Base.h"
-
-// begin wxGlade: ::extracode
-// end wxGlade
-
-
-
-InstallVerifyFrame_Base::InstallVerifyFrame_Base(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
- wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxTHICK_FRAME)
-{
- // begin wxGlade: InstallVerifyFrame_Base::InstallVerifyFrame_Base
- mDmodDescription = new wxTextCtrl(this, wxID_ANY, _("Preparing..."), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY);
- const wxString mDestdirBox_choices[] = {
- _("Main Dink directory"),
- _("Additional D-Mods directory")
- };
- mDestdirBox = new wxRadioBox(this, wxID_ANY, _("Where do you want to install this D-Mod?"), wxDefaultPosition, wxDefaultSize, 2, mDestdirBox_choices, 0, wxRA_SPECIFY_ROWS);
- mInstallButton = new wxButton(this, wxID_OK, _("Install"));
- mCancelButton = new wxButton(this, wxID_CANCEL, wxEmptyString);
-
- set_properties();
- do_layout();
- // end wxGlade
-}
-
-
-void InstallVerifyFrame_Base::set_properties()
-{
- // begin wxGlade: InstallVerifyFrame_Base::set_properties
- SetTitle(_("DFArc - Install D-Mod"));
- mDmodDescription->SetMinSize(wxSize(390,150));
- mDestdirBox->SetSelection(0);
- mInstallButton->SetFocus();
- mInstallButton->SetDefault();
- // end wxGlade
-}
-
-
-void InstallVerifyFrame_Base::do_layout()
-{
- // begin wxGlade: InstallVerifyFrame_Base::do_layout
- wxBoxSizer* lVerticalSizer = new wxBoxSizer(wxVERTICAL);
- wxBoxSizer* lHorizontalSizer = new wxBoxSizer(wxHORIZONTAL);
- lVerticalSizer->Add(mDmodDescription, 1, wxLEFT|wxRIGHT|wxTOP|wxEXPAND|wxADJUST_MINSIZE, 5);
- lVerticalSizer->Add(mDestdirBox, 0, wxEXPAND|wxADJUST_MINSIZE, 0);
- lHorizontalSizer->Add(mInstallButton, 0, wxADJUST_MINSIZE, 0);
- lHorizontalSizer->Add(mCancelButton, 0, wxLEFT|wxADJUST_MINSIZE, 5);
- lVerticalSizer->Add(lHorizontalSizer, 0, wxALL|wxEXPAND, 5);
- SetSizer(lVerticalSizer);
- lVerticalSizer->Fit(this);
- Layout();
- // end wxGlade
-}
-
diff --git a/src/InstallVerifyFrame_Base.h b/src/InstallVerifyFrame_Base.h
deleted file mode 100644
index 2f9661b..0000000
--- a/src/InstallVerifyFrame_Base.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// -*- C++ -*- generated by wxGlade 0.6.3 on Sun Feb 21 21:08:10 2010
-
-#include <wx/wx.h>
-#include <wx/image.h>
-// begin wxGlade: ::dependencies
-// end wxGlade
-
-
-#ifndef INSTALLVERIFYFRAME_BASE_H
-#define INSTALLVERIFYFRAME_BASE_H
-
-
-// begin wxGlade: ::extracode
-// end wxGlade
-
-
-class InstallVerifyFrame_Base: public wxDialog {
-public:
- // begin wxGlade: InstallVerifyFrame_Base::ids
- // end wxGlade
-
- InstallVerifyFrame_Base(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
-
-private:
- // begin wxGlade: InstallVerifyFrame_Base::methods
- void set_properties();
- void do_layout();
- // end wxGlade
-
-protected:
- // begin wxGlade: InstallVerifyFrame_Base::attributes
- wxTextCtrl* mDmodDescription;
- wxRadioBox* mDestdirBox;
- wxButton* mInstallButton;
- wxButton* mCancelButton;
- // end wxGlade
-}; // wxGlade: end class
-
-
-#endif // INSTALLVERIFYFRAME_BASE_H
diff --git a/src/Options_Base.cpp b/src/Options_Base.cpp
deleted file mode 100644
index 1ef404e..0000000
--- a/src/Options_Base.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// -*- C++ -*- generated by wxGlade 0.6.3 on Sun Feb 21 21:08:09 2010
-
-#include "Options_Base.h"
-
-// begin wxGlade: ::extracode
-// end wxGlade
-
-
-
-Options_Base::Options_Base(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
- wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxTHICK_FRAME)
-{
- // begin wxGlade: Options_Base::Options_Base
- mCloseCheck = new wxCheckBox(this, wxID_ANY, _("Close DFArc on play"));
- mShowDeveloperCheck = new wxCheckBox(this, wxID_ANY, _("Show developer buttons"));
- mWriteIniCheck = new wxCheckBox(this, wxID_ANY, _("The engine updates dinksmallwood.ini on run (deprecated)"));
- mOverrideDinkrefDirCheck = new wxCheckBox(this, wxID_ANY, _("Override the Dink Smallwood directory"));
- mOverrideDinkrefDirBox = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
- mOverrideDinkrefDirBrowse = new wxButton(this, ID_OVERRIDE_DINKREFDIR_BROWSE, _("Browse"));
- lDModDirLabel = new wxStaticText(this, wxID_ANY, _("Additional D-Mods directory"));
- mDModDirBox = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
- mDModDirBrowse = new wxButton(this, ID_DMODDIR_BROWSE, _("Browse"));
- lDinkExeLabel = new wxStaticText(this, wxID_ANY, _("Game program name"));
- const wxString *mDinkExeBox_choices = NULL;
- mDinkExeBox = new wxComboBox(this, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, 0, mDinkExeBox_choices, wxCB_DROPDOWN|wxCB_SORT);
- lEditorExeLabel = new wxStaticText(this, wxID_ANY, _("Editor program name"));
- const wxString *mEditorExeBox_choices = NULL;
- mEditorExeBox = new wxComboBox(this, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, 0, mEditorExeBox_choices, wxCB_DROPDOWN|wxCB_SORT);
- mPreferredFileBrowserLabel = new wxStaticText(this, wxID_ANY, _("Preferred file browser"));
- mPreferredFileBrowserBox = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
- lOkay = new wxButton(this, wxID_OK, wxEmptyString);
- lCancel = new wxButton(this, wxID_CANCEL, wxEmptyString);
-
- set_properties();
- do_layout();
- // end wxGlade
-}
-
-
-void Options_Base::set_properties()
-{
- // begin wxGlade: Options_Base::set_properties
- SetTitle(_("DFArc - Options"));
- lOkay->SetDefault();
- // end wxGlade
-}
-
-
-void Options_Base::do_layout()
-{
- // begin wxGlade: Options_Base::do_layout
- wxBoxSizer* lMainSizer = new wxBoxSizer(wxVERTICAL);
- wxBoxSizer* lChoicesSizer = new wxBoxSizer(wxHORIZONTAL);
- wxBoxSizer* mPreferredFileBrowserSizer = new wxBoxSizer(wxHORIZONTAL);
- wxBoxSizer* lEditorExeSizer = new wxBoxSizer(wxHORIZONTAL);
- wxBoxSizer* lDinkExeSizer = new wxBoxSizer(wxHORIZONTAL);
- wxBoxSizer* dmoddir = new wxBoxSizer(wxHORIZONTAL);
- wxBoxSizer* lOverrideSizer = new wxBoxSizer(wxHORIZONTAL);
- lMainSizer->Add(mCloseCheck, 0, wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 10);
- lMainSizer->Add(mShowDeveloperCheck, 0, wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 10);
- lMainSizer->Add(mWriteIniCheck, 0, wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 10);
- lOverrideSizer->Add(mOverrideDinkrefDirCheck, 0, wxADJUST_MINSIZE, 0);
- lOverrideSizer->Add(mOverrideDinkrefDirBox, 1, wxLEFT|wxADJUST_MINSIZE, 10);
- lOverrideSizer->Add(mOverrideDinkrefDirBrowse, 0, wxLEFT|wxADJUST_MINSIZE, 10);
- lMainSizer->Add(lOverrideSizer, 0, wxLEFT|wxRIGHT|wxTOP|wxEXPAND, 10);
- dmoddir->Add(lDModDirLabel, 0, wxADJUST_MINSIZE, 0);
- dmoddir->Add(mDModDirBox, 1, wxLEFT|wxADJUST_MINSIZE, 10);
- dmoddir->Add(mDModDirBrowse, 0, wxLEFT|wxADJUST_MINSIZE, 10);
- lMainSizer->Add(dmoddir, 0, wxLEFT|wxRIGHT|wxTOP|wxEXPAND, 10);
- lDinkExeSizer->Add(lDinkExeLabel, 0, wxADJUST_MINSIZE, 10);
- lDinkExeSizer->Add(mDinkExeBox, 1, wxLEFT|wxADJUST_MINSIZE, 10);
- lMainSizer->Add(lDinkExeSizer, 0, wxLEFT|wxRIGHT|wxTOP|wxEXPAND, 10);
- lEditorExeSizer->Add(lEditorExeLabel, 0, wxADJUST_MINSIZE, 10);
- lEditorExeSizer->Add(mEditorExeBox, 1, wxLEFT|wxADJUST_MINSIZE, 10);
- lMainSizer->Add(lEditorExeSizer, 0, wxLEFT|wxRIGHT|wxTOP|wxEXPAND, 10);
- mPreferredFileBrowserSizer->Add(mPreferredFileBrowserLabel, 0, wxLEFT|wxADJUST_MINSIZE, 0);
- mPreferredFileBrowserSizer->Add(mPreferredFileBrowserBox, 1, wxLEFT|wxADJUST_MINSIZE, 10);
- lMainSizer->Add(mPreferredFileBrowserSizer, 1, wxLEFT|wxRIGHT|wxTOP|wxEXPAND, 10);
- lChoicesSizer->Add(lOkay, 0, wxALIGN_BOTTOM|wxADJUST_MINSIZE, 0);
- lChoicesSizer->Add(lCancel, 0, wxLEFT|wxALIGN_BOTTOM|wxADJUST_MINSIZE, 10);
- lMainSizer->Add(lChoicesSizer, 1, wxALL|wxALIGN_BOTTOM, 10);
- SetSizer(lMainSizer);
- lMainSizer->Fit(this);
- Layout();
- // end wxGlade
-}
-
diff --git a/src/Options_Base.h b/src/Options_Base.h
deleted file mode 100644
index 3fc8ad6..0000000
--- a/src/Options_Base.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*- generated by wxGlade 0.6.3 on Sun Feb 21 21:08:09 2010
-
-#include <wx/wx.h>
-#include <wx/image.h>
-// begin wxGlade: ::dependencies
-// end wxGlade
-
-
-#ifndef OPTIONS_BASE_H
-#define OPTIONS_BASE_H
-
-
-// begin wxGlade: ::extracode
-// end wxGlade
-
-
-class Options_Base: public wxDialog {
-public:
- // begin wxGlade: Options_Base::ids
- enum {
- ID_OVERRIDE_DINKREFDIR_BROWSE = wxID_HIGHEST + 1000,
- ID_DMODDIR_BROWSE = wxID_HIGHEST + 1001
- };
- // end wxGlade
-
- Options_Base(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
-
-private:
- // begin wxGlade: Options_Base::methods
- void set_properties();
- void do_layout();
- // end wxGlade
-
-protected:
- // begin wxGlade: Options_Base::attributes
- wxCheckBox* mCloseCheck;
- wxCheckBox* mShowDeveloperCheck;
- wxCheckBox* mWriteIniCheck;
- wxCheckBox* mOverrideDinkrefDirCheck;
- wxTextCtrl* mOverrideDinkrefDirBox;
- wxButton* mOverrideDinkrefDirBrowse;
- wxStaticText* lDModDirLabel;
- wxTextCtrl* mDModDirBox;
- wxButton* mDModDirBrowse;
- wxStaticText* lDinkExeLabel;
- wxComboBox* mDinkExeBox;
- wxStaticText* lEditorExeLabel;
- wxComboBox* mEditorExeBox;
- wxStaticText* mPreferredFileBrowserLabel;
- wxTextCtrl* mPreferredFileBrowserBox;
- wxButton* lOkay;
- wxButton* lCancel;
- // end wxGlade
-}; // wxGlade: end class
-
-
-#endif // OPTIONS_BASE_H
diff --git a/src/Package_Base.cpp b/src/Package_Base.cpp
deleted file mode 100644
index 9fa0081..0000000
--- a/src/Package_Base.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- C++ -*- generated by wxGlade 0.6.3 on Sun Feb 21 21:08:10 2010
-
-#include "Package_Base.h"
-
-// begin wxGlade: ::extracode
-// end wxGlade
-
-
-
-Package_Base::Package_Base(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long style):
- wxDialog(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxTHICK_FRAME)
-{
- // begin wxGlade: Package_Base::Package_Base
- lIdentifierBox_staticbox = new wxStaticBox(this, -1, _("Identifier"));
- lIntroText = new wxStaticText(this, wxID_ANY, _("Note: Unless you're making a D-Mod, you shouldn't be around here.\nThis is for creating a .dmod file for a D-Mod you made.\n\nWill package '%s' located at\n%s"));
- lIdentifierText = new wxStaticText(this, wxID_ANY, _("D-Mod filename (8 letters/numbers)"));
- mIdentifier = new wxTextCtrl(this, wxID_ANY, wxEmptyString);
- mOkay = new wxButton(this, wxID_OK, _("Package"));
- mCancel = new wxButton(this, wxID_CANCEL, wxEmptyString);
-
- set_properties();
- do_layout();
- // end wxGlade
-}
-
-
-void Package_Base::set_properties()
-{
- // begin wxGlade: Package_Base::set_properties
- SetTitle(_("DFArc - Package"));
- mOkay->SetDefault();
- // end wxGlade
-}
-
-
-void Package_Base::do_layout()
-{
- // begin wxGlade: Package_Base::do_layout
- wxBoxSizer* lMainSizer = new wxBoxSizer(wxVERTICAL);
- wxBoxSizer* lActionBox = new wxBoxSizer(wxHORIZONTAL);
- wxStaticBoxSizer* lIdentifierBox = new wxStaticBoxSizer(lIdentifierBox_staticbox, wxHORIZONTAL);
- lMainSizer->Add(lIntroText, 1, wxLEFT|wxRIGHT|wxTOP|wxEXPAND|wxADJUST_MINSIZE, 10);
- lIdentifierBox->Add(lIdentifierText, 1, wxALL|wxEXPAND|wxADJUST_MINSIZE, 2);
- lIdentifierBox->Add(mIdentifier, 1, wxALL|wxALIGN_RIGHT|wxADJUST_MINSIZE, 2);
- lMainSizer->Add(lIdentifierBox, 1, wxLEFT|wxRIGHT|wxTOP|wxEXPAND, 10);
- lActionBox->Add(mOkay, 0, wxADJUST_MINSIZE, 0);
- lActionBox->Add(mCancel, 0, wxLEFT|wxADJUST_MINSIZE, 10);
- lMainSizer->Add(lActionBox, 0, wxALL|wxEXPAND, 10);
- SetSizer(lMainSizer);
- lMainSizer->Fit(this);
- Layout();
- // end wxGlade
-}
-
diff --git a/src/Package_Base.h b/src/Package_Base.h
deleted file mode 100644
index a89676f..0000000
--- a/src/Package_Base.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// -*- C++ -*- generated by wxGlade 0.6.3 on Sun Feb 21 21:08:10 2010
-
-#include <wx/wx.h>
-#include <wx/image.h>
-// begin wxGlade: ::dependencies
-// end wxGlade
-
-
-#ifndef PACKAGE_BASE_H
-#define PACKAGE_BASE_H
-
-
-// begin wxGlade: ::extracode
-// end wxGlade
-
-
-class Package_Base: public wxDialog {
-public:
- // begin wxGlade: Package_Base::ids
- // end wxGlade
-
- Package_Base(wxWindow* parent, int id, const wxString& title, const wxPoint& pos=wxDefaultPosition, const wxSize& size=wxDefaultSize, long style=wxDEFAULT_DIALOG_STYLE);
-
-private:
- // begin wxGlade: Package_Base::methods
- void set_properties();
- void do_layout();
- // end wxGlade
-
-protected:
- // begin wxGlade: Package_Base::attributes
- wxStaticBox* lIdentifierBox_staticbox;
- wxStaticText* lIntroText;
- wxStaticText* lIdentifierText;
- wxTextCtrl* mIdentifier;
- wxButton* mOkay;
- wxButton* mCancel;
- // end wxGlade
-}; // wxGlade: end class
-
-
-#endif // PACKAGE_BASE_H
--
Packaging for DFArc
More information about the Pkg-games-commits
mailing list