Author: dylan
Date: 2004-10-11 19:45:05 -0400 (Mon, 11 Oct 2004)
New Revision: 385
Added:
branches/wxhaver-autotools/bootstrap
Modified:
branches/wxhaver-autotools/src/Makefile.am
branches/wxhaver-autotools/src/wxHaver.h
branches/wxhaver-autotools/src/wxHaverFrame.cpp
branches/wxhaver-autotools/src/wxHaverParser.cpp
branches/wxhaver-autotools/src/wxHaverParser.h
Log:
added bootstrap script. Run it and ./configure && make to build. :)
Added: branches/wxhaver-autotools/bootstrap
===================================================================
--- branches/wxhaver-autotools/bootstrap 2004-10-11 23:20:07 UTC (rev
384)
+++ branches/wxhaver-autotools/bootstrap 2004-10-11 23:45:05 UTC (rev
385)
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -x
+mkdir -p config/
+aclocal && \
+autoconf && \
+autoheader && \
+automake -a
Property changes on: branches/wxhaver-autotools/bootstrap
___________________________________________________________________
Name: svn:executable
+ *
Modified: branches/wxhaver-autotools/src/Makefile.am
===================================================================
--- branches/wxhaver-autotools/src/Makefile.am 2004-10-11 23:20:07 UTC (rev
384)
+++ branches/wxhaver-autotools/src/Makefile.am 2004-10-11 23:45:05 UTC (rev
385)
@@ -1,2 +1,7 @@
bin_PROGRAMS = wxhaver
-wxhaver_SOURCES = wxHaver.cpp wxHaver.h wxh_includes.h
+wxhaver_SOURCES = wxHaver.cpp \
+ wxHaver.h \
+ wxHaverFrame.cpp \
+ wxHaverFrame.h \
+ wxHaverParser.cpp \
+ wxHaverParser.h
Modified: branches/wxhaver-autotools/src/wxHaver.h
===================================================================
--- branches/wxhaver-autotools/src/wxHaver.h 2004-10-11 23:20:07 UTC (rev
384)
+++ branches/wxhaver-autotools/src/wxHaver.h 2004-10-11 23:45:05 UTC (rev
385)
@@ -34,7 +34,7 @@
WH_ID_Quit = 1,
WH_ID_Connect,
WH_CTRL_ServerSplitter,
- WH_Socket,
+ WH_Socket /* No comma! */
};
#endif // WH_wxHaver_H
Modified: branches/wxhaver-autotools/src/wxHaverFrame.cpp
===================================================================
--- branches/wxhaver-autotools/src/wxHaverFrame.cpp 2004-10-11 23:20:07 UTC
(rev 384)
+++ branches/wxhaver-autotools/src/wxHaverFrame.cpp 2004-10-11 23:45:05 UTC
(rev 385)
@@ -75,8 +75,9 @@
SetSizer(topsizer);
- wxHaverCallback<wxHaverFrame> *want = new wxHaverCallback<wxHaverFrame>
- (this, &wxHaverFrame::OnWant);
+ wxHaverCallback<wxHaverFrame> *want;
+ want = new wxHaverCallback<wxHaverFrame>(this, &wxHaverFrame::OnWant);
+
mParser.AddCommand("WANT", want);
mSock = new wxHaverSockClient();
Modified: branches/wxhaver-autotools/src/wxHaverParser.cpp
===================================================================
--- branches/wxhaver-autotools/src/wxHaverParser.cpp 2004-10-11 23:20:07 UTC
(rev 384)
+++ branches/wxhaver-autotools/src/wxHaverParser.cpp 2004-10-11 23:45:05 UTC
(rev 385)
@@ -38,7 +38,7 @@
printf("Splitting \"%s\" by \"%s\"\n", line.c_str(), splitby.c_str());
size_t tp;
vector<wxString> tokens;
- while (tp = line.find(splitby)) {
+ while ((tp = line.find(splitby))) {
if (tp == wxString::npos) break;
tokens.push_back(line.substr(0, tp));
line.erase(0, tp+1);
@@ -67,6 +67,8 @@
{
if (str != CRLF) str += "\t";
Write(str.c_str(), str.length());
+
+ return *this;
}
//------------------------------------------------------------------------
@@ -81,11 +83,15 @@
int wxHaverParser::AddCommand(wxString cmdname, wxHaverFunctor *callback)
{
_commands[cmdname] = callback;
+
+ return 0;
}
int wxHaverParser::DelCommand(wxString cmdname)
{
_commands.erase(cmdname);
+
+ return 0;
}
void wxHaverParser::Parse(wxString line)
Modified: branches/wxhaver-autotools/src/wxHaverParser.h
===================================================================
--- branches/wxhaver-autotools/src/wxHaverParser.h 2004-10-11 23:20:07 UTC
(rev 384)
+++ branches/wxhaver-autotools/src/wxHaverParser.h 2004-10-11 23:45:05 UTC
(rev 385)
@@ -55,6 +55,7 @@
{
private:
void (T::*fpt)(std::vector<wxString>);
+ // XXX: This causes spurrious compiler errors. Why?
T* pt2Obj;
public:
wxHaverCallback(T *_pt2Obj,
void(T::*_fpt)(std::vector<wxString>)):
