Version 0.23.50.23.5

12 files changed, 47 insertions, 38 deletions

diff --git a/MyRuLib/MyRuLib.cbp b/MyRuLib/MyRuLib.cbp
index 7aa6aa1e..ac1a5a80 100644
--- a/MyRuLib/MyRuLib.cbp
+++ b/MyRuLib/MyRuLib.cbp
@@ -216,6 +216,8 @@
 		<Unit filename="FbDataPath.h" />
 		<Unit filename="FbDatabase.cpp" />
 		<Unit filename="FbDatabase.h" />
+		<Unit filename="FbDateTree.cpp" />
+		<Unit filename="FbDateTree.h" />
 		<Unit filename="FbDownloader.cpp" />
 		<Unit filename="FbDownloader.h" />
 		<Unit filename="FbEditBook.cpp" />
@@ -230,6 +232,7 @@
 		<Unit filename="FbFrameAuthor.h" />
 		<Unit filename="FbFrameBase.cpp" />
 		<Unit filename="FbFrameBase.h" />
+		<Unit filename="FbFrameDate.cpp" />
 		<Unit filename="FbFrameDate.h" />
 		<Unit filename="FbFrameDownld.cpp" />
 		<Unit filename="FbFrameDownld.h" />
diff --git a/TreeView/FbTreeModel.cpp b/TreeView/FbTreeModel.cpp
index 91acb8de..22e48e06 100644
--- a/TreeView/FbTreeModel.cpp
+++ b/TreeView/FbTreeModel.cpp
@@ -165,7 +165,7 @@ FbModel::PaintContext::PaintContext(wxDC &dc):
 IMPLEMENT_CLASS(FbModel, wxObject)

 

 FbModel::FbModel() :

-    m_owner(NULL), m_position(0)

+    m_owner(NULL), m_position(0), m_shift(0)

 {

 }

 

diff --git a/TreeView/FbTreeModel.h b/TreeView/FbTreeModel.h
index 22824456..26e433e9 100644
--- a/TreeView/FbTreeModel.h
+++ b/TreeView/FbTreeModel.h
@@ -2,6 +2,9 @@
 #define __FBTREEMODEL_H__

 

 #include <wx/dc.h>

+#include <wx/dynarray.h>

+

+WX_DEFINE_ARRAY_SIZE_T(size_t, FbArraySizeT);

 

 class FbModel;

 

@@ -34,7 +37,7 @@ class FbModelData: public wxObject
 			{ return NULL; };

 		virtual bool HiddenRoot() const

 			{ return true; }

-		virtual bool GetSelection(FbModel & model) const 

+		virtual bool GetSelection(FbModel & model) const

 			{ return false; }

 		virtual void SetSelection(FbModel & model, bool value)

 			{}

@@ -61,7 +64,7 @@ class FbParentData: public FbModelData
 			{ return m_parent; }

 		virtual bool IsBold(FbModel & model) const

 			{ return true; }

-		void Delete(size_t index) 

+		void Delete(size_t index)

 			{ m_items.RemoveAt(index); }

 		virtual size_t CountAll(const FbModel & model) const;

 		virtual FbModelData* Items(FbModel & model, size_t index) const;

@@ -129,7 +132,7 @@ class FbModel: public wxObject
 		virtual ~FbModel() {}

 

 		void DrawTree(wxDC &dc, const wxRect &rect, const FbColumnArray &cols, size_t pos, int h);

-		void SetFocused(bool focused) 

+		void SetFocused(bool focused)

 			{ m_focused = focused; }

 		FbModelData * GetData(size_t row)

 			{ int level; return DoGetData(row, level); }

@@ -164,6 +167,8 @@ class FbModel: public wxObject
 		wxWindow * m_owner;

 		size_t m_position;

 		bool m_focused;

+		size_t m_shift;

+		FbArraySizeT m_ctrls;

 		DECLARE_CLASS(FbModel);

 };

 

diff --git a/TreeView/TestMain.cpp b/TreeView/TestMain.cpp
index 22d73459..dd1fde4e 100644
--- a/TreeView/TestMain.cpp
+++ b/TreeView/TestMain.cpp
@@ -15,6 +15,7 @@
 #include "TestApp.h"

 #include "FbTreeView.h"

 #include "FbTreeModel.h"

+#include <wx/listbase.h>

 

 //-----------------------------------------------------------------------------

 //  FbTestModelData

@@ -31,7 +32,7 @@ class FbTestModelData: public FbModelData
 			{ return m_state; }

 		virtual void SetState(FbModel & model, bool state)

 			{ m_state = state; }

-		virtual bool GetSelection(FbModel & model) const 

+		virtual bool GetSelection(FbModel & model) const

 			{ return m_selected; }

 		virtual void SetSelection(FbModel & model, bool value)

 			{ m_selected = value; }

@@ -72,7 +73,7 @@ class FbTreeModelData: public FbParentData
 			{ m_state = state; }

 		virtual bool IsBold(FbModel & model) const

 			{ return false; }

-		virtual bool GetSelection(FbModel & model) const 

+		virtual bool GetSelection(FbModel & model) const

 			{ return m_selected; }

 		virtual void SetSelection(FbModel & model, bool value)

 			{ m_selected = value; }

@@ -115,7 +116,7 @@ BEGIN_EVENT_TABLE( DataViewFrame, wxFrame )
 	EVT_MENU( ID_MODIFY_TYPE, DataViewFrame::OnModifyType )

 	EVT_MENU( ID_DELETE_TYPE, DataViewFrame::OnDeleteType )

 	EVT_TREE_ITEM_ACTIVATED(ID_TYPE_LIST, DataViewFrame::OnTypeActivated)

-	EVT_LIST_COL_CLICK(ID_TYPE_LIST, OnColumnClick)

+	EVT_LIST_COL_CLICK(ID_TYPE_LIST, DataViewFrame::OnColumnClick)

 END_EVENT_TABLE()

 

 DataViewFrame::DataViewFrame( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style )

diff --git a/TreeView/TestMain.h b/TreeView/TestMain.h
index ee11a9d9..36d8df70 100644
--- a/TreeView/TestMain.h
+++ b/TreeView/TestMain.h
@@ -11,7 +11,6 @@
 #define DATAVIEWMAIN_H

 

 #include <wx/wx.h>

-#include <wx/listbase.h>

 

 class wxTreeEvent;

 

diff --git a/TreeView/TreeView.cbp b/TreeView/TreeView.cbp
index a4347c8e..15fc2af4 100644
--- a/TreeView/TreeView.cbp
+++ b/TreeView/TreeView.cbp
@@ -156,12 +156,6 @@
 			<Add library="libWxSQLite3.a" />
 			<Add library="libSQLite3.a" />
 		</Linker>
-		<Unit filename="FbAuthList.cpp" />
-		<Unit filename="FbAuthList.h" />
-		<Unit filename="FbBookEvent.cpp" />
-		<Unit filename="FbBookEvent.h" />
-		<Unit filename="FbCollection.cpp" />
-		<Unit filename="FbCollection.h" />
 		<Unit filename="FbDatabase.cpp" />
 		<Unit filename="FbDatabase.h" />
 		<Unit filename="FbTreeModel.cpp" />
diff --git a/configure b/configure
index 48321a21..f09553d1 100644
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for MyRuLib 0.23.4.
+# Generated by GNU Autoconf 2.65 for MyRuLib 0.23.5.
 #
 # Report bugs to <mail@lintest.ru>.
 #
@@ -552,8 +552,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='MyRuLib'
 PACKAGE_TARNAME='myrulib'
-PACKAGE_VERSION='0.23.4'
-PACKAGE_STRING='MyRuLib 0.23.4'
+PACKAGE_VERSION='0.23.5'
+PACKAGE_STRING='MyRuLib 0.23.5'
 PACKAGE_BUGREPORT='mail@lintest.ru'
 PACKAGE_URL='http://myrulib.lintest.ru/'
 
@@ -1302,7 +1302,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures MyRuLib 0.23.4 to adapt to many kinds of systems.
+\`configure' configures MyRuLib 0.23.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1368,7 +1368,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of MyRuLib 0.23.4:";;
+     short | recursive ) echo "Configuration of MyRuLib 0.23.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1474,7 +1474,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-MyRuLib configure 0.23.4
+MyRuLib configure 0.23.5
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1807,7 +1807,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by MyRuLib $as_me 0.23.4, which was
+It was created by MyRuLib $as_me 0.23.5, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -8915,7 +8915,7 @@ else
 fi
 
 echo
-echo "Configured MyRuLib 0.23.4 for \`${host}' wxWidgets ${WX_VERSION}"
+echo "Configured MyRuLib 0.23.5 for \`${host}' wxWidgets ${WX_VERSION}"
 echo
 echo "  Use buildin Expat library?                ${USE_EXPAT}"
 echo "  Use buildin SQLite3 library?              ${USE_SQLITE}"
@@ -9466,7 +9466,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by MyRuLib $as_me 0.23.4, which was
+This file was extended by MyRuLib $as_me 0.23.5, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9520,7 +9520,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-MyRuLib config.status 0.23.4
+MyRuLib config.status 0.23.5
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.in b/configure.in
index c62cf609..aa55e6f6 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
 
-AC_INIT([MyRuLib],[0.23.4],[mail@lintest.ru],[myrulib],[http://myrulib.lintest.ru/])
+AC_INIT([MyRuLib],[0.23.5],[mail@lintest.ru],[myrulib],[http://myrulib.lintest.ru/])
 
 AC_CONFIG_SRCDIR([MyRuLib/MyRuLibApp.cpp])
 AC_CONFIG_SRCDIR([autoconf_inc.m4])
diff --git a/debian/changelog b/debian/changelog
index 67ec22b5..4b9bc371 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+myrulib (0.23.5) lucid; urgency=low
+
+  * Update release
+
+ -- Denis Kandrashin <mail@lintest.ru>  Thu, 17 Jun 2010 20:48:44 +0400
+
 myrulib (0.22.12-ubuntu1004) lucid; urgency=low
 
   * Update release
diff --git a/debian/rules b/debian/rules
index d084f9eb..a5f3e361 100644
--- a/debian/rules
+++ b/debian/rules
@@ -9,13 +9,18 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+
+
+
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 	# Add here commands to configure the package.
-
+	./configure
 	touch configure-stamp
 
+
 build: build-stamp
 
 build-stamp: configure-stamp  
@@ -24,7 +29,6 @@ build-stamp: configure-stamp
 	# Add here commands to compile the package.
 	$(MAKE)
 	#docbook-to-man debian/myrulib.sgml > myrulib.1
-
 	touch $@
 
 clean: 
@@ -33,7 +37,7 @@ clean:
 	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
-	$(MAKE) clean
+	-$(MAKE) clean
 
 	dh_clean 
 
diff --git a/rpmbuild/myrulib.spec b/rpmbuild/myrulib.spec
index a13640cd..c15b0717 100644
--- a/rpmbuild/myrulib.spec
+++ b/rpmbuild/myrulib.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package myrulib (Version 0.20)
+# spec file for package myrulib (Version 0.23)
 #
 # Copyright (c) 2009-2010 Denis Kandrashin, Kyrill Detinov
 # This file and all modifications and additions to the pristine
@@ -7,7 +7,7 @@
 #
 
 Name:		myrulib
-Version:	0.22.9
+Version:	0.23.5
 Release:	0
 License:	GPL
 Summary:	E-Book Library Manager
@@ -19,7 +19,6 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-build
 
 %if 0%{?suse_version}
 BuildRequires:	wxGTK-devel >= 2.8.10
-BuildRequires:	sqlite3-devel
 BuildRequires:	libexpat-devel
 BuildRequires:	update-desktop-files
 %endif
@@ -27,16 +26,10 @@ BuildRequires:	update-desktop-files
 %if 0%{?mandriva_version}
 BuildRequires:	libwxgtku2.8-devel >= 2.8.10
 BuildRequires:	libexpat-devel
-%if %{_arch} == x86_64
-BuildRequires:	lib64sqlite3-devel
-%else
-BuildRequires:	libsqlite3-devel
-%endif
 %endif
 
 %if 0%{?fedora_version}
 BuildRequires:	wxGTK-devel >= 2.8.10
-BuildRequires:	sqlite-devel
 BuildRequires:	expat-devel
 BuildRequires:	desktop-file-utils
 %endif
@@ -50,10 +43,14 @@ Authors:
 
 %prep
 %setup -q
+[ ! -x configure ] && %{__chmod} +x configure
 
 %build
 export CXXFLAGS="%{optflags}"
 export CFLAGS="%{optflags}"
+%{configure}\
+    --with-sqlite\
+    --without-strip
 make %{?_smp_mflags}
 
 %install
diff --git a/version.inc b/version.inc
index 185e88fc..7d048ce2 100644
--- a/version.inc
+++ b/version.inc
@@ -1,3 +1,3 @@
 #define VERSION_MAJOR      0

 #define VERSION_MINOR     23

-#define VERSION_BUILD      4

+#define VERSION_BUILD      5