[sword-cvs] swordreader/src/gui ApplicationInterface.h,1.2,1.3 Main.cpp,1.7,1.8 NavBooks.cpp,1.5,1.6 NavBooks.h,1.5,1.6 NavChap.h,1.2,1.3 NavFind.cpp,1.3,1.4 NavFind.h,1.3,1.4 Navigator.cpp,1.9,1.10 Navigator.h,1.8,1.9 NavNumbers.h,1.5,1.6 NavPage.h,1.3,1.4 NavRenderText.cpp,1.10,1.11 NavRenderText.h,1.4,1.5 NavVerse.cpp,1.2,1.3 NavVerse.h,1.2,1.3 resource.h,1.3,1.4 SwordIndex.cpp,1.9,1.10 SwordIndex.h,1.5,1.6
sword@www.crosswire.org
sword@www.crosswire.org
Mon, 15 Mar 2004 03:44:37 -0700
Update of /cvs/core/swordreader/src/gui
In directory www:/tmp/cvs-serv25075
Modified Files:
ApplicationInterface.h Main.cpp NavBooks.cpp NavBooks.h
NavChap.h NavFind.cpp NavFind.h Navigator.cpp Navigator.h
NavNumbers.h NavPage.h NavRenderText.cpp NavRenderText.h
NavVerse.cpp NavVerse.h resource.h SwordIndex.cpp SwordIndex.h
Log Message:
Checked in using winCVS
Index: ApplicationInterface.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/ApplicationInterface.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ApplicationInterface.h 31 Jan 2004 22:43:32 -0000 1.2
+++ ApplicationInterface.h 15 Mar 2004 10:44:35 -0000 1.3
@@ -86,11 +86,11 @@
void addMenu(HMENU menu, int id, UString text);
-void checkMenu(HMENU menu, int id, bool checked);
-
-// Get an id to give to the CreateWindow as hMenu
+void checkMenu(HMENU menu, int id, bool checked);
+
+// Get an id to give to the CreateWindow as hMenu
HMENU registerID(int id);
-
-UString getText(HWND edit);
+
+UString getText(HWND edit);
#endif
Index: Main.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/Main.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Main.cpp 28 Feb 2004 19:43:29 -0000 1.7
+++ Main.cpp 15 Mar 2004 10:44:35 -0000 1.8
@@ -1,12 +1,12 @@
#include "ApplicationInterface.h"
-#include "Main.h"
+#include "Main.h"
-#ifdef SIMPLE
- #include "SimpleNavigator.h"
- #define NAVIGATOR SimpleNavigator
-#else
- #include "Navigator.h"
- #define NAVIGATOR Navigator
+#ifdef SIMPLE
+ #include "SimpleNavigator.h"
+ #define NAVIGATOR SimpleNavigator
+#else
+ #include "Navigator.h"
+ #define NAVIGATOR Navigator
#endif
#include <aygshell.h>
@@ -161,11 +161,11 @@
if ((wmId>=USERBUTTONS)&&(wmId<USERBUTTONS+1000)) {
g_navigator->buttonClicked(wmId-USERBUTTONS);
break;
- }
- else if (g_navigator->menuClicked(wmId))
- {}
+ }
+ else if (g_navigator->menuClicked(wmId))
+ {}
else
- return DefWindowProc(hWnd, message, wParam, lParam);
+ return DefWindowProc(hWnd, message, wParam, lParam);
break;
}
break;
Index: NavBooks.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavBooks.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- NavBooks.cpp 28 Feb 2004 19:43:29 -0000 1.5
+++ NavBooks.cpp 15 Mar 2004 10:44:35 -0000 1.6
@@ -126,12 +126,12 @@
}
}
return -1;
-}
-
-void NavBooks::userTap(int x, int y) {
- int number=numberAt(x,y);
- if (number>0) {
- navigator->setBook(number);
- navigator->setMode(MODE_CHAP);
- }
+}
+
+void NavBooks::userTap(int x, int y) {
+ int number=numberAt(x,y);
+ if (number>0) {
+ navigator->setBook(number);
+ navigator->setMode(MODE_CHAP);
+ }
}
Index: NavBooks.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavBooks.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- NavBooks.h 28 Feb 2004 19:43:29 -0000 1.5
+++ NavBooks.h 15 Mar 2004 10:44:35 -0000 1.6
@@ -1,11 +1,11 @@
-#ifndef NAVBOOKS_H
+#ifndef NAVBOOKS_H
#define NAVBOOKS_H
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
-#include "utils.h"
+#include "utils.h"
#include "NavPage.h"
class SimpleNavigator;
@@ -20,7 +20,7 @@
// signals that the user has tapped somewhere.
// returns: the number that the user has tapped. -1 if no number
void userTap(int x, int y);
-private:
+private:
int numberAt(int x, int y);
SwordIndex* position;
UString command;
Index: NavChap.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavChap.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- NavChap.h 28 Feb 2004 19:43:29 -0000 1.2
+++ NavChap.h 15 Mar 2004 10:44:35 -0000 1.3
@@ -1,24 +1,24 @@
-#ifndef NAVCHAP_H
-#define NAVCHAP_H
-
-class Navigator;
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#include "utils.h"
-#include "NavPage.h"
-#include "NavNumbers.h"
-
-class SimpleNavigator;
-
-class NavChap : public NavNumbers {
-public:
- NavChap(SimpleNavigator* navigator);
- virtual ~NavChap();
- void show();
- void userTap(int x, int y);
-};
-
-#endif
+#ifndef NAVCHAP_H
+#define NAVCHAP_H
+
+class Navigator;
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#include "utils.h"
+#include "NavPage.h"
+#include "NavNumbers.h"
+
+class SimpleNavigator;
+
+class NavChap : public NavNumbers {
+public:
+ NavChap(SimpleNavigator* navigator);
+ virtual ~NavChap();
+ void show();
+ void userTap(int x, int y);
+};
+
+#endif
Index: NavFind.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavFind.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- NavFind.cpp 28 Feb 2004 19:43:29 -0000 1.3
+++ NavFind.cpp 15 Mar 2004 10:44:35 -0000 1.4
@@ -1,49 +1,49 @@
#include "ApplicationInterface.h"
#include "NavFind.h"
-#include "Navigator.h"
+#include "Navigator.h"
#include <winuser.h>
NavFind::NavFind(SimpleNavigator* navigator) : NavPage(navigator) {
- //this->navigator=navigator;
- goButtonID=navigator->getID();
- query=L"Busy implementing, id=";
- query+=toUString(goButtonID);
- queryEdit = CreateWindow(_T("edit"), NULL,
- WS_CHILD | ES_AUTOHSCROLL | ES_LEFT | WS_TABSTOP | WS_BORDER,
- RECT_SCREEN.left, RECT_SCREEN.top, RECT_SCREEN.right-30, 20,
- g_hWnd, NULL, g_hInst, NULL);
- go = CreateWindow(_T("button"), L"Go",
- WS_CHILD | BS_PUSHBUTTON,
- RECT_SCREEN.right-30, RECT_SCREEN.top, 30, 20,
- g_hWnd, registerID(goButtonID), g_hInst, NULL);
+ //this->navigator=navigator;
+ goButtonID=navigator->getID();
+ query=L"Busy implementing, id=";
+ query+=toUString(goButtonID);
+ queryEdit = CreateWindow(_T("edit"), NULL,
+ WS_CHILD | ES_AUTOHSCROLL | ES_LEFT | WS_TABSTOP | WS_BORDER,
+ RECT_SCREEN.left, RECT_SCREEN.top, RECT_SCREEN.right-30, 20,
+ g_hWnd, NULL, g_hInst, NULL);
+ go = CreateWindow(_T("button"), L"Go",
+ WS_CHILD | BS_PUSHBUTTON,
+ RECT_SCREEN.right-30, RECT_SCREEN.top, 30, 20,
+ g_hWnd, registerID(goButtonID), g_hInst, NULL);
}
NavFind::~NavFind() {
}
void NavFind::show() {
- ShowWindow(queryEdit,SW_SHOW);
- ShowWindow(go,SW_SHOW);
+ ShowWindow(queryEdit,SW_SHOW);
+ ShowWindow(go,SW_SHOW);
}
void NavFind::hide() {
- ShowWindow(queryEdit,SW_HIDE);
- ShowWindow(go,SW_HIDE);
+ ShowWindow(queryEdit,SW_HIDE);
+ ShowWindow(go,SW_HIDE);
}
-void NavFind::paint() {
- RECT rect;
- GetWindowRect(queryEdit,&rect);
- RECT bottom=RECT_SCREEN;
+void NavFind::paint() {
+ RECT rect;
+ GetWindowRect(queryEdit,&rect);
+ RECT bottom=RECT_SCREEN;
bottom.top=rect.bottom-rect.top;
- drawText(&bottom, query);
+ drawText(&bottom, query);
}
-
-void NavFind::buttonClicked(int id) {
- if (id==goButtonID) {
- query=L"Search for '";
- query+=getText(queryEdit);
- query+=L"' not implemented";
- refreshScreen();
- }
+
+void NavFind::buttonClicked(int id) {
+ if (id==goButtonID) {
+ query=L"Search for '";
+ query+=getText(queryEdit);
+ query+=L"' not implemented";
+ refreshScreen();
+ }
}
Index: NavFind.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavFind.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- NavFind.h 28 Feb 2004 19:43:29 -0000 1.3
+++ NavFind.h 15 Mar 2004 10:44:35 -0000 1.4
@@ -5,24 +5,24 @@
#pragma once
#endif // _MSC_VER > 1000
-#include "utils.h"
+#include "utils.h"
#include "NavPage.h"
class SimpleNavigator;
class NavFind: public NavPage {
-public:
+public:
NavFind(SimpleNavigator* navigator);
- ~NavFind();
+ ~NavFind();
void show();
void paint();
- void hide();
+ void hide();
void buttonClicked(int id);
-private:
- //Navigator* navigator;
- HWND queryEdit,go;
- int goButtonID;
- UString query;
+private:
+ //Navigator* navigator;
+ HWND queryEdit,go;
+ int goButtonID;
+ UString query;
};
#endif
Index: Navigator.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/Navigator.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Navigator.cpp 28 Feb 2004 19:43:29 -0000 1.9
+++ Navigator.cpp 15 Mar 2004 10:44:35 -0000 1.10
@@ -1,10 +1,10 @@
-#include "Navigator.h"
-
-Navigator::Navigator(RECT* screen):SimpleNavigator(screen) {
- text2=pages[MODE_TEXT2]=new ConstructionPage(this);
- menus[MODE_TEXT2]=MENU_TEXT2;
-}
-
-Navigator::~Navigator() {
- delete text2;
+#include "Navigator.h"
+
+Navigator::Navigator(RECT* screen):SimpleNavigator(screen) {
+ text2=pages[MODE_TEXT2]=new ConstructionPage(this);
+ menus[MODE_TEXT2]=MENU_TEXT2;
+}
+
+Navigator::~Navigator() {
+ delete text2;
}
Index: Navigator.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/Navigator.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Navigator.h 28 Feb 2004 19:43:29 -0000 1.8
+++ Navigator.h 15 Mar 2004 10:44:35 -0000 1.9
@@ -1,31 +1,31 @@
-#ifndef NAVIGATOR_H
-#define NAVIGATOR_H
+#ifndef NAVIGATOR_H
+#define NAVIGATOR_H
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
-#include "SimpleNavigator.h"
-#include "ApplicationInterface.h"
-
-#define MODE_TEXT2 5
-
-class NavPage;
-
-class ConstructionPage: public NavPage {
- public:
- ConstructionPage(SimpleNavigator* navigator):NavPage(navigator) {};
- void paint() {
- drawText(&RECT_SCREEN, L"Under construction");
- };
+#include "SimpleNavigator.h"
+#include "ApplicationInterface.h"
+
+#define MODE_TEXT2 5
+
+class NavPage;
+
+class ConstructionPage: public NavPage {
+ public:
+ ConstructionPage(SimpleNavigator* navigator):NavPage(navigator) {};
+ void paint() {
+ drawText(&RECT_SCREEN, L"Under construction");
+ };
};
-class Navigator : public SimpleNavigator {
- private:
- NavPage* text2;
- public:
- Navigator(RECT* screen);
- virtual ~Navigator();
+class Navigator : public SimpleNavigator {
+ private:
+ NavPage* text2;
+ public:
+ Navigator(RECT* screen);
+ virtual ~Navigator();
};
#endif
Index: NavNumbers.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavNumbers.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- NavNumbers.h 28 Feb 2004 19:43:29 -0000 1.5
+++ NavNumbers.h 15 Mar 2004 10:44:35 -0000 1.6
@@ -6,12 +6,12 @@
#endif // _MSC_VER > 1000
#include "utils.h"
-#include "NavPage.h"
+#include "NavPage.h"
class SimpleNavigator;
class NavNumbers: public NavPage {
-public:
+public:
NavNumbers(SimpleNavigator* navigator);
virtual ~NavNumbers();
Index: NavPage.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavPage.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- NavPage.h 28 Feb 2004 19:43:29 -0000 1.3
+++ NavPage.h 15 Mar 2004 10:44:35 -0000 1.4
@@ -1,62 +1,62 @@
-#ifndef NAVPAGE_H
-#define NAVPAGE_H
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#include "utils.h"
-
-class SimpleNavigator;
-
-class NavPage
-{
-public:
- // In a derived class, use this constructor to instantiate visual
- // components using CreateWindow. For example:
- //
- // anEdit = CreateWindow(_T("edit"), NULL,
- // WS_CHILD | WS_BORDER,
- // RECT_SCREEN.left, RECT_SCREEN.top, 30, 20,
- // g_hWnd, NULL, g_hInst, NULL);
- //
- // In order to listen to button clicks, they first need to be
- // registered here in the navigator like this:
- //
- // aButtonID=navigator->getID();
- //
- // aButton = CreateWindow(_T("button"), L"Go",
- // WS_CHILD | BS_PUSHBUTTON,
- // RECT_SCREEN.right-30, RECT_SCREEN.top, 30, 20,
- // g_hWnd, registerID(goButtonID), g_hInst, NULL);
- NavPage(SimpleNavigator* navigator) {this->navigator=navigator;};
- // Destructor
- ~NavPage() {};
- // In the derived class, show all visual components here using
- // ShowWindow. For example:
- //
- // ShowWindow(anEdit,SW_SHOW);
- virtual void show() {};
- // In the derived class, hide all visual components here using
- // ShowWindow. For example:
- //
- // ShowWindow(anEdit,SW_HIDE);
- virtual void hide() {};
- // In the derived class, use this method to do all custom
- // painting, using methods from ApplicationInterface.cpp. Example:
- //
- // drawText(&RECT_SCREEN, L"Under construction");
- virtual void paint() {};
- // In the derived class, use this method to listen to buttons being
- // clicked. See the comment in the constructor on how to obtain the id
- virtual void buttonClicked(int id) {};
- // In the derived class, use this method to listen to 'mouse clicks'
- // that do not occur inside visual components.
- virtual void userTap(int x, int y) {};
- // In the derived class, use this method to listen to keys being pressed
- virtual void keyDown(WPARAM id, LPARAM lparam) {};
-protected:
- SimpleNavigator* navigator;
-};
-
-#endif
+#ifndef NAVPAGE_H
+#define NAVPAGE_H
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#include "utils.h"
+
+class SimpleNavigator;
+
+class NavPage
+{
+public:
+ // In a derived class, use this constructor to instantiate visual
+ // components using CreateWindow. For example:
+ //
+ // anEdit = CreateWindow(_T("edit"), NULL,
+ // WS_CHILD | WS_BORDER,
+ // RECT_SCREEN.left, RECT_SCREEN.top, 30, 20,
+ // g_hWnd, NULL, g_hInst, NULL);
+ //
+ // In order to listen to button clicks, they first need to be
+ // registered here in the navigator like this:
+ //
+ // aButtonID=navigator->getID();
+ //
+ // aButton = CreateWindow(_T("button"), L"Go",
+ // WS_CHILD | BS_PUSHBUTTON,
+ // RECT_SCREEN.right-30, RECT_SCREEN.top, 30, 20,
+ // g_hWnd, registerID(goButtonID), g_hInst, NULL);
+ NavPage(SimpleNavigator* navigator) {this->navigator=navigator;};
+ // Destructor
+ ~NavPage() {};
+ // In the derived class, show all visual components here using
+ // ShowWindow. For example:
+ //
+ // ShowWindow(anEdit,SW_SHOW);
+ virtual void show() {};
+ // In the derived class, hide all visual components here using
+ // ShowWindow. For example:
+ //
+ // ShowWindow(anEdit,SW_HIDE);
+ virtual void hide() {};
+ // In the derived class, use this method to do all custom
+ // painting, using methods from ApplicationInterface.cpp. Example:
+ //
+ // drawText(&RECT_SCREEN, L"Under construction");
+ virtual void paint() {};
+ // In the derived class, use this method to listen to buttons being
+ // clicked. See the comment in the constructor on how to obtain the id
+ virtual void buttonClicked(int id) {};
+ // In the derived class, use this method to listen to 'mouse clicks'
+ // that do not occur inside visual components.
+ virtual void userTap(int x, int y) {};
+ // In the derived class, use this method to listen to keys being pressed
+ virtual void keyDown(WPARAM id, LPARAM lparam) {};
+protected:
+ SimpleNavigator* navigator;
+};
+
+#endif
Index: NavRenderText.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavRenderText.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- NavRenderText.cpp 28 Feb 2004 19:43:29 -0000 1.10
+++ NavRenderText.cpp 15 Mar 2004 10:44:35 -0000 1.11
@@ -1,6 +1,6 @@
#include "ApplicationInterface.h"
#include "NavRenderText.h"
-#include "Navigator.h"
+#include "Navigator.h"
#include <swordce.h>
@@ -41,7 +41,7 @@
void NavRenderText::show() {
ShowWindow(htmlControl,SW_SHOW);
- showText();
+ showText();
}
void NavRenderText::showText() {
@@ -56,7 +56,7 @@
}
else
controlToVerse(htmlControl,verse);
- navigator->chapterCache=true;
+ navigator->chapterCache=true;
}
void NavRenderText::load() {
@@ -115,7 +115,7 @@
ShowWindow(htmlControl,SW_HIDE);
}
-void NavRenderText::paint() {
+void NavRenderText::paint() {
}
UString NavRenderText::getVerseHeader() {
@@ -135,22 +135,22 @@
void NavRenderText::keyDown(WPARAM id, LPARAM lparam) {
switch (id) {
case VK_UP:
- navigator->position--;
- if (navigator->position.getVerse()==navigator->position.verseCount())
+ navigator->position--;
+ if (navigator->position.getVerse()==navigator->position.verseCount())
navigator->chapterCache=false;
break;
case VK_DOWN:
navigator->position++;
- if (navigator->position.getVerse()==1) navigator->chapterCache=false;
+ if (navigator->position.getVerse()==1) navigator->chapterCache=false;
break;
case VK_LEFT:
navigator->position.setVerse(1);
navigator->position--;
- navigator->chapterCache=false;
+ navigator->chapterCache=false;
break;
case VK_RIGHT:
navigator->position.setVerse(navigator->position.verseCount());
- navigator->position++;
+ navigator->position++;
navigator->chapterCache=false;
break;
}
Index: NavRenderText.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavRenderText.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- NavRenderText.h 28 Feb 2004 19:43:29 -0000 1.4
+++ NavRenderText.h 15 Mar 2004 10:44:35 -0000 1.5
@@ -6,7 +6,7 @@
#endif // _MSC_VER > 1000
#include "utils.h"
-#include "NavPage.h"
+#include "NavPage.h"
class SimpleNavigator;
Index: NavVerse.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavVerse.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- NavVerse.cpp 28 Feb 2004 19:43:29 -0000 1.2
+++ NavVerse.cpp 15 Mar 2004 10:44:35 -0000 1.3
@@ -1,24 +1,24 @@
-#include "NavVerse.h"
-#include "ApplicationInterface.h"
-#include "NavFind.h"
-#include "Navigator.h"
-
-NavVerse::NavVerse(SimpleNavigator* navigator):NavNumbers(navigator){
- command=L"Select a verse";
-}
-
-NavVerse::~NavVerse(){
-}
-
-void NavVerse::show() {
- NavNumbers::show();
- maxNumber=navigator->verseCount();
-}
-
-void NavVerse::userTap(int x, int y) {
- int number=numberAt(x,y);
- if (number>0) {
- navigator->setVerse(number);
- navigator->setMode(MODE_TEXT);
- }
+#include "NavVerse.h"
+#include "ApplicationInterface.h"
+#include "NavFind.h"
+#include "Navigator.h"
+
+NavVerse::NavVerse(SimpleNavigator* navigator):NavNumbers(navigator){
+ command=L"Select a verse";
+}
+
+NavVerse::~NavVerse(){
+}
+
+void NavVerse::show() {
+ NavNumbers::show();
+ maxNumber=navigator->verseCount();
+}
+
+void NavVerse::userTap(int x, int y) {
+ int number=numberAt(x,y);
+ if (number>0) {
+ navigator->setVerse(number);
+ navigator->setMode(MODE_TEXT);
+ }
}
Index: NavVerse.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/NavVerse.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- NavVerse.h 28 Feb 2004 19:43:29 -0000 1.2
+++ NavVerse.h 15 Mar 2004 10:44:35 -0000 1.3
@@ -1,25 +1,25 @@
-#ifndef NAVVERSE_H
-#define NAVVERSE_H
-
-class Navigator;
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#include "utils.h"
-#include "NavPage.h"
-#include "NavNumbers.h"
-
-class SimpleNavigator;
-
-class NavVerse : public NavNumbers
-{
-public:
- NavVerse(SimpleNavigator* navigator);
- virtual ~NavVerse();
- void show();
- void userTap(int x, int y);
-};
-
-#endif
+#ifndef NAVVERSE_H
+#define NAVVERSE_H
+
+class Navigator;
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#include "utils.h"
+#include "NavPage.h"
+#include "NavNumbers.h"
+
+class SimpleNavigator;
+
+class NavVerse : public NavNumbers
+{
+public:
+ NavVerse(SimpleNavigator* navigator);
+ virtual ~NavVerse();
+ void show();
+ void userTap(int x, int y);
+};
+
+#endif
Index: resource.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/resource.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- resource.h 28 Feb 2004 19:43:29 -0000 1.3
+++ resource.h 15 Mar 2004 10:44:35 -0000 1.4
@@ -1,47 +1,47 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by BibleReader.rc
-//
-#define MENU_ABOUT 0
-#define IDS_APP_TITLE 1
-#define IDS_HELLO 2
-#define IDC_BIBLEREADER 3
-#define IDI_BIBLEREADER 101
-#define IDM_MENU 102
-#define IDD_ERROR_NOBIBLES 103
-#define IDS_HELP 104
-#define IDS_COMMAND1 301
-#define IDM_MAIN_COMMAND1 40001
-#define IDM_HELP_ABOUT 40003
-#define MENU_BOOK 40004
-#define IDS_CAP_BOOK 40006
-#define MENU_CHAP 40007
-#define IDS_CAP_CHAP 40009
-#define MENU_VERSE 40010
-#define IDS_CAP_TEXT 40013
-#define MENU_BIBLE 40014
-#define IDS_CAP_VERSE 40016
-#define IDS_CAP_BIBLE 40018
-#define MENU_TEXT 40019
-#define IDS_SELECTBOOK 40019
-#define IDS_SELECTCHAP 40020
-#define MENU_MENU 40021
-#define IDS_SELECTBIBLE 40022
-#define IDS_CAP_MENU 40023
-#define MENU_FIND 40029
-#define IDS_CAP_FIND 40030
-#define MENU_SHUTDOWN 40031
-#define MENU_TEXT2 40032
-#define IDS_CAP_TE2 40034
-#define USERBUTTONS 41000
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 109
-#define _APS_NEXT_COMMAND_VALUE 40035
-#define _APS_NEXT_CONTROL_VALUE 1002
-#define _APS_NEXT_SYMED_VALUE 102
-#endif
-#endif
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by BibleReader.rc
+//
+#define MENU_ABOUT 0
+#define IDS_APP_TITLE 1
+#define IDS_HELLO 2
+#define IDC_BIBLEREADER 3
+#define IDI_BIBLEREADER 101
+#define IDM_MENU 102
+#define IDD_ERROR_NOBIBLES 103
+#define IDS_HELP 104
+#define IDS_COMMAND1 301
+#define IDM_MAIN_COMMAND1 40001
+#define IDM_HELP_ABOUT 40003
+#define MENU_BOOK 40004
+#define IDS_CAP_BOOK 40006
+#define MENU_CHAP 40007
+#define IDS_CAP_CHAP 40009
+#define MENU_VERSE 40010
+#define IDS_CAP_TEXT 40013
+#define MENU_BIBLE 40014
+#define IDS_CAP_VERSE 40016
+#define IDS_CAP_BIBLE 40018
+#define MENU_TEXT 40019
+#define IDS_SELECTBOOK 40019
+#define IDS_SELECTCHAP 40020
+#define MENU_MENU 40021
+#define IDS_SELECTBIBLE 40022
+#define IDS_CAP_MENU 40023
+#define MENU_FIND 40029
+#define IDS_CAP_FIND 40030
+#define MENU_SHUTDOWN 40031
+#define MENU_TEXT2 40032
+#define IDS_CAP_TE2 40034
+#define USERBUTTONS 41000
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 109
+#define _APS_NEXT_COMMAND_VALUE 40035
+#define _APS_NEXT_CONTROL_VALUE 1002
+#define _APS_NEXT_SYMED_VALUE 102
+#endif
+#endif
Index: SwordIndex.cpp
===================================================================
RCS file: /cvs/core/swordreader/src/gui/SwordIndex.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- SwordIndex.cpp 31 Jan 2004 22:43:32 -0000 1.9
+++ SwordIndex.cpp 15 Mar 2004 10:44:35 -0000 1.10
@@ -164,4 +164,4 @@
void SwordIndex::setModule(Module m) {
bible=m;
bible->setKey(verse);
-}
+}
Index: SwordIndex.h
===================================================================
RCS file: /cvs/core/swordreader/src/gui/SwordIndex.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- SwordIndex.h 31 Jan 2004 22:43:32 -0000 1.5
+++ SwordIndex.h 15 Mar 2004 10:44:35 -0000 1.6
@@ -1,5 +1,5 @@
-#ifndef SWORDINDEX_H
-#define SWORDINDEX_H
+#ifndef SWORDINDEX_H
+#define SWORDINDEX_H
#if _MSC_VER > 1000
#pragma once