Use shared wxSQLite3 library

7 files changed, 93 insertions, 29 deletions

diff --git a/Makefile.in b/Makefile.in
index 0eadfc7f..a978ed10 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -135,20 +135,17 @@ MRL_WXSQLITE3_OBJECTS =  \
 MRL_WXBZIP2_CXXFLAGS =  -DNDEBUG  $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 MRL_WXBZIP2_OBJECTS =  \
 	mrl_wxbzip2_bzipstream.o
-ZIPSCAN_CFLAGS = -DNDEBUG -I$(srcdir)/sources/MyRuLib \
-	-I$(srcdir)/3rdparty/wxsqlite3/include $(WX_CFLAGS) $(CPPFLAGS) $(CFLAGS)
-ZIPSCAN_CXXFLAGS = -DNDEBUG -I$(srcdir)/sources/MyRuLib \
-	-I$(srcdir)/3rdparty/wxsqlite3/include $(WX_CXXFLAGS) $(CPPFLAGS) \
-	$(CXXFLAGS)
+ZIPSCAN_CFLAGS = -DNDEBUG -I$(srcdir)/sources/MyRuLib $(WX_CFLAGS) $(CPPFLAGS) \
+	$(CFLAGS)
+ZIPSCAN_CXXFLAGS = -DNDEBUG -I$(srcdir)/sources/MyRuLib $(WX_CXXFLAGS) \
+	$(CPPFLAGS) $(CXXFLAGS)
 ZIPSCAN_OBJECTS =  \
 	zipscan_ZipScan.o \
 	zipscan_md5.o
 MYRULIB_CFLAGS = -I. -DNDEBUG -D_MYRULIB -I$(srcdir)/sources/MyRuLib \
-	-I$(srcdir)/3rdparty/wxsqlite3/include -I$(srcdir)/3rdparty/wxbzipstream \
-	$(WX_CFLAGS) $(CPPFLAGS) $(CFLAGS)
+	-I$(srcdir)/3rdparty/wxbzipstream $(WX_CFLAGS) $(CPPFLAGS) $(CFLAGS)
 MYRULIB_CXXFLAGS = -I. -DNDEBUG -D_MYRULIB -I$(srcdir)/sources/MyRuLib \
-	-I$(srcdir)/3rdparty/wxsqlite3/include -I$(srcdir)/3rdparty/wxbzipstream \
-	$(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+	-I$(srcdir)/3rdparty/wxbzipstream $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 MYRULIB_OBJECTS =  \
 	myrulib_FbChoiceCtrl.o \
 	myrulib_FbComboBox.o \
@@ -270,6 +267,8 @@ MYRULIB_ODEP = ru.inc uk.inc be.inc cs.inc sv.inc $(__fb2_css_inc___depname)
 @COND_USE_SQLITE_builtin@	$(LIBPREFIX)mrl_sqlite3$(LIBEXT)
 @COND_USE_READER_yes@__mrl_crengine___depname = \
 @COND_USE_READER_yes@	$(LIBPREFIX)mrl_crengine$(LIBEXT)
+@COND_USE_WXSQL_builtin@__mrl_wxsqlite3___depname = \
+@COND_USE_WXSQL_builtin@	$(LIBPREFIX)mrl_wxsqlite3$(LIBEXT)
 @COND_PLATFORM_MAC_0@__zipscan___mac_setfilecmd = @true
 @COND_PLATFORM_MAC_1@__zipscan___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL zipscan$(EXEEXT)
@@ -284,7 +283,7 @@ COND_PLATFORM_OS2_1___myrulib___os2_emxbindcmd = $(NM) myrulib$(EXEEXT) | if \
 
 ### Targets: ###
 
-all: $(__mrl_bzip2___depname) $(__mrl_expat___depname) $(__mrl_faxpp___depname) $(__mrl_sqlite3___depname) $(__mrl_crengine___depname) $(LIBPREFIX)mrl_wxsqlite3$(LIBEXT) $(LIBPREFIX)mrl_wxbzip2$(LIBEXT) zipscan$(EXEEXT) myrulib$(EXEEXT)
+all: $(__mrl_bzip2___depname) $(__mrl_expat___depname) $(__mrl_faxpp___depname) $(__mrl_sqlite3___depname) $(__mrl_crengine___depname) $(__mrl_wxsqlite3___depname) $(LIBPREFIX)mrl_wxbzip2$(LIBEXT) zipscan$(EXEEXT) myrulib$(EXEEXT)
 
 install: install_myrulib
 	$(INSTALL) -d $(DESTDIR)$(datadir)/locale/ru/LC_MESSAGES
@@ -371,18 +370,18 @@ distclean: clean
 @COND_USE_READER_yes@	$(AR) $(AROPTIONS) $@ $(MRL_CRENGINE_OBJECTS)
 @COND_USE_READER_yes@	$(RANLIB) $@
 
-$(LIBPREFIX)mrl_wxsqlite3$(LIBEXT): $(MRL_WXSQLITE3_OBJECTS)
-	rm -f $@
-	$(AR) $(AROPTIONS) $@ $(MRL_WXSQLITE3_OBJECTS)
-	$(RANLIB) $@
+@COND_USE_WXSQL_builtin@$(LIBPREFIX)mrl_wxsqlite3$(LIBEXT): $(MRL_WXSQLITE3_OBJECTS)
+@COND_USE_WXSQL_builtin@	rm -f $@
+@COND_USE_WXSQL_builtin@	$(AR) $(AROPTIONS) $@ $(MRL_WXSQLITE3_OBJECTS)
+@COND_USE_WXSQL_builtin@	$(RANLIB) $@
 
 $(LIBPREFIX)mrl_wxbzip2$(LIBEXT): $(MRL_WXBZIP2_OBJECTS)
 	rm -f $@
 	$(AR) $(AROPTIONS) $@ $(MRL_WXBZIP2_OBJECTS)
 	$(RANLIB) $@
 
-zipscan$(EXEEXT): $(ZIPSCAN_OBJECTS) $(__mrl_bzip2___depname) $(__mrl_expat___depname) $(__mrl_faxpp___depname) $(__mrl_sqlite3___depname) $(__mrl_crengine___depname) $(LIBPREFIX)mrl_wxbzip2$(LIBEXT) $(LIBPREFIX)mrl_wxsqlite3$(LIBEXT) $(LIBPREFIX)mrl_wxsqlite3$(LIBEXT)
-	$(CXX) -o $@ $(ZIPSCAN_OBJECTS) -L. -L. -L.     $(LDFLAGS)  -lmrl_wxbzip2 -lmrl_wxsqlite3 -lmrl_wxsqlite3 $(WX_LIBS) $(LIBS)
+zipscan$(EXEEXT): $(ZIPSCAN_OBJECTS) $(__mrl_bzip2___depname) $(__mrl_expat___depname) $(__mrl_faxpp___depname) $(__mrl_sqlite3___depname) $(__mrl_crengine___depname) $(__mrl_wxsqlite3___depname) $(LIBPREFIX)mrl_wxbzip2$(LIBEXT)
+	$(CXX) -o $@ $(ZIPSCAN_OBJECTS) -L.     $(LDFLAGS)  -lmrl_wxbzip2 $(WX_LIBS) $(LIBS)
 	
 	$(__zipscan___mac_setfilecmd)
 
@@ -422,8 +421,8 @@ sv.inc: bin2c sv.mo
 @COND_USE_READER_yes@fb2_css.inc: bin2c $(srcdir)/3rdparty/crengine/css/fb2.css
 @COND_USE_READER_yes@	./bin2c $(srcdir)/3rdparty/crengine/css/fb2.css ./fb2_css.inc file
 
-myrulib$(EXEEXT): $(MYRULIB_OBJECTS) $(__mrl_bzip2___depname) $(__mrl_expat___depname) $(__mrl_faxpp___depname) $(__mrl_sqlite3___depname) $(__mrl_crengine___depname) $(LIBPREFIX)mrl_wxbzip2$(LIBEXT) $(LIBPREFIX)mrl_wxsqlite3$(LIBEXT) $(__myrulib___win32rc)
-	$(CXX) -o $@ $(MYRULIB_OBJECTS) -L. -L.  $(LDFLAGS_GUI)   $(LDFLAGS)  -lmrl_wxbzip2 -lmrl_wxsqlite3 $(WX_LIBS) $(LIBS)
+myrulib$(EXEEXT): $(MYRULIB_OBJECTS) $(__mrl_bzip2___depname) $(__mrl_expat___depname) $(__mrl_faxpp___depname) $(__mrl_sqlite3___depname) $(__mrl_crengine___depname) $(__mrl_wxsqlite3___depname) $(LIBPREFIX)mrl_wxbzip2$(LIBEXT) $(__myrulib___win32rc)
+	$(CXX) -o $@ $(MYRULIB_OBJECTS) -L.  $(LDFLAGS_GUI)   $(LDFLAGS)  -lmrl_wxbzip2 $(WX_LIBS) $(LIBS)
 	
 	$(__myrulib___mac_setfilecmd)
 	$(__myrulib___os2_emxbindcmd)
@@ -962,7 +961,7 @@ myrulib_base64.o: $(srcdir)/sources/MyRuLib/wx/base64.cpp $(MYRULIB_ODEP)
 	$(CXXC) -c -o $@ $(MYRULIB_CXXFLAGS) $(srcdir)/sources/MyRuLib/wx/base64.cpp
 
 myrulib_resource_rc.o: $(srcdir)/sources/MyRuLib/res/resource.rc $(MYRULIB_ODEP)
-	$(WX_RESCOMP) -i$< -o$@  --include-dir . --include-dir . --define NDEBUG --define _MYRULIB --include-dir $(srcdir)/sources/MyRuLib --include-dir $(srcdir)/3rdparty/wxsqlite3/include --include-dir $(srcdir)/3rdparty/wxbzipstream
+	$(WX_RESCOMP) -i$< -o$@  --include-dir . --include-dir . --define NDEBUG --define _MYRULIB --include-dir $(srcdir)/sources/MyRuLib --include-dir $(srcdir)/3rdparty/wxbzipstream
 
 
 # Include dependency info, if present:
diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index 2284b0ea..b5310e87 100644
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -72,6 +72,12 @@ dnl ### begin block 20_COND_USE_SQLITE_builtin[myrulib.bkl] ###
         COND_USE_SQLITE_builtin=""
     fi
     AC_SUBST(COND_USE_SQLITE_builtin)
+dnl ### begin block 20_COND_USE_WXSQL_builtin[myrulib.bkl] ###
+    COND_USE_WXSQL_builtin="#"
+    if test "x$USE_WXSQL" = "xbuiltin" ; then
+        COND_USE_WXSQL_builtin=""
+    fi
+    AC_SUBST(COND_USE_WXSQL_builtin)
 dnl ### begin block 20_COND_WX_DEBUG_0_WX_UNICODE_1[myrulib.bkl] ###
     COND_WX_DEBUG_0_WX_UNICODE_1="#"
     if test "x$WX_DEBUG" = "x0" -a "x$WX_UNICODE" = "x1" ; then
diff --git a/configure b/configure
index 976aebc2..b6a2743e 100755
--- a/configure
+++ b/configure
@@ -630,6 +630,7 @@ ICU_CONFIG
 COND_WX_DEBUG_1_WX_UNICODE_1
 COND_WX_DEBUG_1_WX_UNICODE_0
 COND_WX_DEBUG_0_WX_UNICODE_1
+COND_USE_WXSQL_builtin
 COND_USE_SQLITE_builtin
 COND_USE_READER_yes
 COND_USE_FAXPP_builtin
@@ -794,6 +795,7 @@ with_expat
 with_faxpp
 with_bzip2
 with_sqlite
+with_wxsqlite
 with_icu
 with_reader
 with_syslog
@@ -1460,6 +1462,7 @@ Optional Packages:
   --with-faxpp            Use FAXPP (Fast XML Pull Parser) library
   --with-bzip2            Use builtin BZip2 library
   --with-sqlite           Use builtin SQLite3 library
+  --with-wxsqlite         Use builtin wxSQLite3 library
   --with-icu              Use ICU for unicode collation
   --with-reader           Use Cool Reader Engine
   --with-syslog           Use system logger: syslog
@@ -2286,6 +2289,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 SQLITE_VERSION=3.6.0
 WXWIDGETS_VERSION=2.8.10
+WXSQL_VERSION=2.0.0
 
 
 
@@ -4959,6 +4963,19 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_SQLITE" >&5
 $as_echo "$USE_SQLITE" >&6; }
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-wxsqlite" >&5
+$as_echo_n "checking for --with-wxsqlite... " >&6; }
+
+# Check whether --with-wxsqlite was given.
+if test "${with_wxsqlite+set}" = set; then :
+  withval=$with_wxsqlite; USE_WXSQL="$withval"
+else
+  USE_WXSQL="yes"
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_WXSQL" >&5
+$as_echo "$USE_WXSQL" >&6; }
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-icu" >&5
 $as_echo_n "checking for --with-icu... " >&6; }
 
@@ -5059,7 +5076,7 @@ fi
 
 fi
 
-if test "x$USE_SQLITE" == "xyes" ; then
+if test "x$USE_SQLLITE" == "xyes" ; then
     USE_SQLITE="builtin"
 fi
 
@@ -5349,6 +5366,11 @@ $as_echo "$ac_cv_sqlite_enable_icu" >&6; }
   fi
 fi
 
+if test "x$USE_WXSQL" == "xyes" ; then
+    USE_WXSQL="builtin"
+fi
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-locale" >&5
 $as_echo_n "checking for --with-locale... " >&6; }
 
@@ -9119,6 +9141,11 @@ BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.9"
         COND_USE_SQLITE_builtin=""
     fi
 
+    COND_USE_WXSQL_builtin="#"
+    if test "x$USE_WXSQL" = "xbuiltin" ; then
+        COND_USE_WXSQL_builtin=""
+    fi
+
     COND_WX_DEBUG_0_WX_UNICODE_1="#"
     if test "x$WX_DEBUG" = "x0" -a "x$WX_UNICODE" = "x1" ; then
         COND_WX_DEBUG_0_WX_UNICODE_1=""
@@ -9189,6 +9216,14 @@ else
 fi
 
 
+if test "x$USE_WXSQL" = "xbuiltin" ; then
+  WX_CXXFLAGS="-I\$(srcdir)/3rdparty/wxsqlite3/include $WX_CXXFLAGS"
+  WX_LIBS="-lmrl_wxsqlite3 $WX_LIBS"
+else
+  WX_LIBS="-lwxsqlite3-2.8 $WX_LIBS"
+fi
+
+
 if test "x$USE_LIBICU" = "xyes" ; then
   # Extract the first word of "icu-config", so it can be a program name with args.
 set dummy icu-config; ac_word=$2
@@ -10688,6 +10723,7 @@ echo "  Use Expat XML parser instead of Libxml2?      ${USE_EXPAT}"
 echo "  Use FAXPP (Fast XML Pull Parser) library?     ${USE_FAXPP}"
 echo "  Use builtin BZip2 library?                    ${USE_BZIP2}"
 echo "  Use builtin SQLite3 library?                  ${USE_SQLITE}"
+echo "  Use builtin wxSQLite3 library?                ${USE_WXSQL}"
 echo "  Use ICU for unicode collation?                ${USE_LIBICU}"
 echo "  Use Cool Reader Engine?                       ${USE_READER}"
 echo "  Use system logger: syslog?                    ${USE_SYSLOG}"
diff --git a/configure.in b/configure.in
index 9b47b4e0..22745403 100644
--- a/configure.in
+++ b/configure.in
@@ -8,6 +8,7 @@ dnl Set the minimum version of toolkit libs
 dnl ========================================================
 SQLITE_VERSION=3.6.0
 WXWIDGETS_VERSION=2.8.10
+WXSQL_VERSION=2.0.0
 
 AC_CONFIG_SRCDIR([MyRuLib/MyRuLibApp.cpp])
 AC_CONFIG_SRCDIR([autoconf_inc.m4])
@@ -93,6 +94,10 @@ AC_MSG_CHECKING([for --with-sqlite])
 AC_ARG_WITH([sqlite], [AS_HELP_STRING([--with-sqlite], [Use builtin SQLite3 library])], USE_SQLITE="$withval", USE_SQLITE="no")
 AC_MSG_RESULT([$USE_SQLITE])
 
+AC_MSG_CHECKING([for --with-wxsqlite])
+AC_ARG_WITH([wxsqlite], [AS_HELP_STRING([--with-wxsqlite], [Use builtin wxSQLite3 library])], USE_WXSQL="$withval", USE_WXSQL="yes")
+AC_MSG_RESULT([$USE_WXSQL])
+
 AC_MSG_CHECKING([for --with-icu])
 AC_ARG_WITH(icu, AS_HELP_STRING([--with-icu],[Use ICU for unicode collation]), USE_LIBICU="$withval", USE_LIBICU="no")
 AC_MSG_RESULT([$USE_LIBICU])
@@ -113,7 +118,7 @@ if test "x$USE_BZIP2" != "xbuiltin" ; then
   AC_CHECK_HEADER(bzlib.h, [AC_CHECK_LIB(bz2, BZ2_bzwrite, , USE_BZIP2="builtin")], USE_BZIP2="builtin")
 fi
 
-if test "x$USE_SQLITE" == "xyes" ; then 
+if test "x$USE_SQLLITE" == "xyes" ; then 
     USE_SQLITE="builtin"
 fi
 
@@ -189,6 +194,14 @@ if test "x$USE_SQLITE" != "xbuiltin" ; then
   fi
 fi
 
+if test "x$USE_WXSQL" == "xyes" ; then 
+    USE_WXSQL="builtin"
+fi
+
+dnl if test "x$USE_WXSQL" != "xbuiltin" ; then 
+dnl   PKG_CHECK_MODULES(wxsqlite3, wxsqlite3A >= $WXSQL_VERSION, , USE_WXSQL="builtin")
+dnl fi
+
 AC_MSG_CHECKING([for --with-locale])
 AC_ARG_WITH([locale], [AS_HELP_STRING([--with-locale], [Include locale files into executable])], USE_LOCALE="$withval", USE_LOCALE="no")
 AC_MSG_RESULT([$USE_LOCALE])
@@ -264,6 +277,17 @@ else
   WX_LIBS="$WX_LIBS $SQLITE_LIBS"
 fi
 
+dnl =================
+dnl === USE_WXSQL ===
+dnl =================
+
+if test "x$USE_WXSQL" = "xbuiltin" ; then 
+  WX_CXXFLAGS="-I\$(srcdir)/3rdparty/wxsqlite3/include $WX_CXXFLAGS"
+  WX_LIBS="-lmrl_wxsqlite3 $WX_LIBS"
+else
+  WX_LIBS="-lwxsqlite3-2.8 $WX_LIBS"
+fi
+
 dnl ==================
 dnl === USE_LIBICU ===
 dnl ==================
@@ -369,6 +393,7 @@ echo "  Use Expat XML parser instead of Libxml2?      ${USE_EXPAT}"
 echo "  Use FAXPP (Fast XML Pull Parser) library?     ${USE_FAXPP}"
 echo "  Use builtin BZip2 library?                    ${USE_BZIP2}"
 echo "  Use builtin SQLite3 library?                  ${USE_SQLITE}"
+echo "  Use builtin wxSQLite3 library?                ${USE_WXSQL}"
 echo "  Use ICU for unicode collation?                ${USE_LIBICU}"
 echo "  Use Cool Reader Engine?                       ${USE_READER}"
 echo "  Use system logger: syslog?                    ${USE_SYSLOG}"
diff --git a/myrulib.bkl b/myrulib.bkl
index 46adb80f..f67b64da 100644
--- a/myrulib.bkl
+++ b/myrulib.bkl
@@ -6,6 +6,7 @@
 	<option name="USE_FAXPP"/>
 	<option name="USE_EXPAT"/>
 	<option name="USE_SQLITE"/>
+	<option name="USE_WXSQL"/>
 	<option name="USE_READER"/>
 	<option name="USE_LOCALE"/>
 	<option name="STRIP_COMMAND"/>
@@ -109,7 +110,7 @@
 		<sources>3rdparty/crengine/src/xutils.cpp</sources>
 	</lib>
 
-	<lib id="mrl_wxsqlite3" template="wx-lib">
+	<lib id="mrl_wxsqlite3" template="wx-lib" cond="USE_WXSQL=='builtin'">
 		<define>NDEBUG</define>
 		<sources>sources/WxSQLite3/wxsqlite3.cpp</sources>
 		<include>$(SRCDIR)/3rdparty/wxsqlite3/include</include>
@@ -126,14 +127,12 @@
 		<depends>mrl_faxpp</depends>
 		<depends>mrl_sqlite3</depends>
 		<depends>mrl_crengine</depends>
+		<depends>mrl_wxsqlite3</depends>
 		<library>mrl_wxbzip2</library>
-		<library>mrl_wxsqlite3</library>
 		<define>NDEBUG</define>
 		<sources>sources/ZipScaner/ZipScan.cpp</sources>
 		<sources>sources/MyRuLib/polarssl/md5.c</sources>
 		<include>$(SRCDIR)/sources/MyRuLib</include>
-		<include>$(SRCDIR)/3rdparty/wxsqlite3/include</include>
-		<library>mrl_wxsqlite3</library>
 		<wx-lib>core</wx-lib>
 		<wx-lib>base</wx-lib>
 		<threading>single</threading>
@@ -224,8 +223,8 @@
 		<depends>mrl_faxpp</depends>
 		<depends>mrl_sqlite3</depends>
 		<depends>mrl_crengine</depends>
+		<depends>mrl_wxsqlite3</depends>
 		<library>mrl_wxbzip2</library>
-		<library>mrl_wxsqlite3</library>
 		<include>$(BUILDDIR)</include>
 		<res-include>$(BUILDDIR)</res-include>
 		<define>NDEBUG</define>
@@ -339,7 +338,6 @@
 		<sources>sources/MyRuLib/wx/base64.cpp</sources>
 		<win32-res>sources/MyRuLib/res/resource.rc</win32-res>
 		<include>$(SRCDIR)/sources/MyRuLib</include>
-		<include>$(SRCDIR)/3rdparty/wxsqlite3/include</include>
 		<include>$(SRCDIR)/3rdparty/wxbzipstream</include>
 		<wx-lib>aui</wx-lib>
 		<wx-lib>html</wx-lib>
diff --git a/sources/MyRuLib/FbMainFrame.cpp b/sources/MyRuLib/FbMainFrame.cpp
index 861ee211..87a53dc6 100644
--- a/sources/MyRuLib/FbMainFrame.cpp
+++ b/sources/MyRuLib/FbMainFrame.cpp
@@ -290,7 +290,7 @@ bool FbMainFrame::Create(wxWindow * parent, wxWindowID id, const wxString & titl
 	} else {

 		size = wxSize( FbParams(FB_FRAME_WIDTH), FbParams(FB_FRAME_HEIGHT) );

 	}

-#endif __WXMAC__

+#endif // __WXMAC__

 

 	bool res = wxFrame::Create(parent, id, title, wxDefaultPosition, size, wxDEFAULT_FRAME_STYLE|wxFRAME_NO_WINDOW_MENU);

 	if(res)	{

diff --git a/sources/MyRuLib/MyRuLibApp.h b/sources/MyRuLib/MyRuLibApp.h
index 96825f54..316b26a9 100644
--- a/sources/MyRuLib/MyRuLibApp.h
+++ b/sources/MyRuLib/MyRuLibApp.h
@@ -33,7 +33,7 @@ class MyRuLibApp : public wxApp
 		virtual int FilterEvent(wxEvent & event);

 		#endif // __WXMSW__

 		virtual void OnUnhandledException() {}

-		virtual bool OnExceptionInMainLoop() { return false; }

+		virtual bool OnExceptionInMainLoop() { return true; }

 	private:

 		void SetLibFile(const wxString & filename);

 		wxFileName GetDatabaseFile();