pyrox.dev
lol
1diff --git a/Makefile b/Makefile
2index a648e72..0387ac1 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -1,5 +1,5 @@
6-CC = `wx-config --cxx`
7-LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip
8+WX_CC = `wx-config --cxx`
9+LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip -lz
10 INSTALL = install
11 INSTALL_PROGRAM = $(INSTALL)
12 prefix = /usr/local
13@@ -13,7 +13,7 @@ OBJS = $(patsubst %.cpp,%.o,$(wildcard src/*.cpp))
14 all: comical
15
16 comical: $(OBJS) unrar/libunrar.a unzip/libminiunzip.a
17- $(CC) -o $@ $(OBJS) $(LDFLAGS)
18+ $(WX_CC) -o $@ $(OBJS) $(LDFLAGS)
19
20 $(OBJS):
21 $(MAKE) -C src
22diff --git a/src/ComicalApp.cpp b/src/ComicalApp.cpp
23index 0c004cd..667e75e 100644
24--- a/src/ComicalApp.cpp
25+++ b/src/ComicalApp.cpp
26@@ -28,6 +28,7 @@
27 #include "ComicalApp.h"
28 #include "ComicalFrame.h"
29 #include <wx/log.h>
30+#include <wx/icon.h>
31
32 #if !defined(__WXMAC__) && !defined(__WXCOCOA__) && !defined(__WXMSW__) && !defined(__WXPM__)
33 #include "../Comical Icons/comical.xpm"
34diff --git a/src/ComicalCanvas.cpp b/src/ComicalCanvas.cpp
35index 75da72f..febce50 100644
36--- a/src/ComicalCanvas.cpp
37+++ b/src/ComicalCanvas.cpp
38@@ -792,11 +792,11 @@ void ComicalCanvas::OnKeyDown(wxKeyEvent& event)
39
40 switch(event.GetKeyCode()) {
41
42- case WXK_PRIOR:
43+ case WXK_PAGEUP:
44 PrevPageTurn();
45 break;
46
47- case WXK_NEXT:
48+ case WXK_PAGEDOWN:
49 NextPageTurn();
50 break;
51
52diff --git a/src/ComicalFrame.cpp b/src/ComicalFrame.cpp
53index 2256be8..154fd6d 100644
54--- a/src/ComicalFrame.cpp
55+++ b/src/ComicalFrame.cpp
56@@ -240,7 +240,7 @@ ComicalFrame::ComicalFrame(const wxString& title, const wxPoint& pos, const wxSi
57 toolbarSizer->AddSpacer(10);
58 toolbarSizer->Add(toolBarNav, 0, wxALIGN_CENTER, 0);
59 toolbarSizer->AddSpacer(10);
60- toolbarSizer->Add(labelRight, 1, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL, 0);
61+ toolbarSizer->Add(labelRight, 1, wxALIGN_CENTER_VERTICAL, 0);
62 toolbarSizer->Layout();
63 bookPanelSizer->Add(toolbarSizer, 0, wxEXPAND, 0);
64 frameSizer->Add(bookPanelSizer, 1, wxEXPAND);
65@@ -279,12 +279,12 @@ void ComicalFrame::OnClose(wxCloseEvent& event)
66
67 wxRect frameDim = GetRect();
68 config->Write(wxT("CacheLength"), (int) cacheLen);
69- config->Write(wxT("Zoom"), zoom);
70+ config->Write(wxT("Zoom"), (int) zoom);
71 config->Write(wxT("ZoomLevel"), zoomLevel);
72 config->Write(wxT("FitOnlyOversize"), fitOnlyOversize);
73- config->Write(wxT("Filter"), filter);
74- config->Write(wxT("Mode"), mode);
75- config->Write(wxT("Direction"), direction);
76+ config->Write(wxT("Filter"), (int) filter);
77+ config->Write(wxT("Mode"), (int) mode);
78+ config->Write(wxT("Direction"), (int) direction);
79 config->Write(wxT("FrameWidth"), frameDim.width);
80 config->Write(wxT("FrameHeight"), frameDim.height);
81 config->Write(wxT("FrameX"), frameDim.x);
82@@ -309,7 +309,7 @@ void ComicalFrame::OnOpen(wxCommandEvent& event)
83 {
84 wxString cwd;
85 config->Read(wxT("CWD"), &cwd);
86- wxString filename = wxFileSelector(wxT("Open a Comic Book"), cwd, wxT(""), wxT(""), wxT("Comic Books (*.cbr,*.cbz,*.rar,*.zip)|*.cbr;*.CBR;*.cbz;*.CBZ;*.rar;*.RAR;*.zip;*.ZIP"), wxOPEN | wxCHANGE_DIR | wxFILE_MUST_EXIST, this);
87+ wxString filename = wxFileSelector(wxT("Open a Comic Book"), cwd, wxT(""), wxT(""), wxT("Comic Books (*.cbr,*.cbz,*.rar,*.zip)|*.cbr;*.CBR;*.cbz;*.CBZ;*.rar;*.RAR;*.zip;*.ZIP"), wxFD_OPEN | wxFD_CHANGE_DIR | wxFD_FILE_MUST_EXIST, this);
88
89 if (!filename.empty())
90 OpenFile(filename);
91diff --git a/src/ComicalManager.cpp b/src/ComicalManager.cpp
92index 12d8334..b10d8fa 100644
93--- a/src/ComicalManager.cpp
94+++ b/src/ComicalManager.cpp
95@@ -27,7 +27,7 @@
96
97 #include "ComicalManager.h"
98
99-ComicalManager::ComicalManager(ComicalFrame *_frame) : wxDocManager(wxDEFAULT_DOCMAN_FLAGS, false), frame(_frame)
100+ComicalManager::ComicalManager(ComicalFrame *_frame) : wxDocManager(0, false), frame(_frame)
101 {
102 }
103
104diff --git a/src/Makefile b/src/Makefile
105index 2a7dc3b..e0a9874 100644
106--- a/src/Makefile
107+++ b/src/Makefile
108@@ -1,3 +1,4 @@
109+WX_CC = `wx-config --cxx`
110 INCLUDE = -I../unrar -I../unzip
111 CFLAGS = -O2 -Wall -pipe
112 CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE)
113@@ -21,11 +22,11 @@ all: $(OBJS)
114 @echo -e "};\n\n#endif" >> $@
115
116 %.o : %.cpp
117- $(CC) $(CPPFLAGS) -c -o $*.o $<
118+ $(WX_CC) $(CPPFLAGS) -c -o $*.o $<
119
120 %.d : %.cpp
121 @set -e; rm -f $@; \
122- $(CC) -MM -MG $(CPPFLAGS) -MT '$*.o' $< > $@.$$$$; \
123+ $(WX_CC) -MM -MG $(CPPFLAGS) -MT '$*.o' $< > $@.$$$$; \
124 sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
125 rm -f $@.$$$$
126
127diff --git a/unzip/unzip.h b/unzip/unzip.h
128index b247937..5bb6a69 100644
129--- a/unzip/unzip.h
130+++ b/unzip/unzip.h
131@@ -50,7 +50,7 @@ extern "C" {
132 #endif
133
134 #ifndef _ZLIB_H
135-#include "zlib.h"
136+#include <zlib.h>
137 #endif
138
139 #ifndef _ZLIBIOAPI_H