1 9444 padraigo --- /usr/tmp/clean/dasher-4.2.0/Src/Gtk2-Experimental/Makefile.am 2006-09-03 20:45:13.000000000 +0100 2 9444 padraigo +++ dasher-4.2.0/Src/Gtk2-Experimental/Makefile.am 2006-10-10 12:00:53.168741000 +0100 3 9444 padraigo @@ -9,4 +9,4 @@ 4 8479 bc99092 5 8479 bc99092 AM_CXXFLAGS = $(GTK2_CFLAGS) $(SETTINGS_CFLAGS) $(gnome_speech_CFLAGS) $(gnome_a11y_CFLAGS) $(glade_CFLAGS) $(gnome_CFLAGS) $(gthread_CFLAGS) $(wnck_CFLAGS) -I$(srcdir)/../Gtk2 -I$(srcdir)/../DasherCore -I$(srcdir)/../intl -I$(top_srcdir)/intl -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" -DPROGDATA=\"$(pkgdatadir)\" 6 8479 bc99092 7 8479 bc99092 -dasher_com_aid_LDFLAGS = $(GTK2_LIBS) $(SETTINGS_LIBS) $(gnome_speech_LIBS) $(gnome_a11y_LIBS) $(glade_LIBS) $(gnome_LIBS) $(gthread_LIBS) $(wnck_LIBS) -lexpat $(X_LIBS) -L../Gtk2 -L../DasherCore -L../DasherCore/LanguageModelling -L../DasherCore/Alphabet -ldashercontrol -ldashercore -ldasherlm -ldasheralphabet 8 8479 bc99092 +dasher_com_aid_LDFLAGS = $(GTK2_LIBS) $(SETTINGS_LIBS) $(gnome_speech_LIBS) $(gnome_a11y_LIBS) $(glade_LIBS) $(gnome_LIBS) $(gthread_LIBS) $(wnck_LIBS) -lexpat $(X_LIBS) -L../Gtk2 -L../DasherCore -L../DasherCore/LanguageModelling -L../DasherCore/Alphabet -L../Common -ldashercontrol -ldashercore -ldasherlm -ldasheralphabet -ldashermisc 9 9444 padraigo --- /usr/tmp/clean/dasher-4.2.0/Src/Makefile.am 2006-09-03 20:45:05.000000000 +0100 10 9444 padraigo +++ dasher-4.2.0/Src/Makefile.am 2006-10-10 12:00:53.169143000 +0100 11 9444 padraigo @@ -33,7 +33,8 @@ 12 8479 bc99092 Gtk2/libdashercontrol.a \ 13 8479 bc99092 DasherCore/libdashercore.a \ 14 8479 bc99092 DasherCore/LanguageModelling/libdasherlm.a \ 15 8479 bc99092 - DasherCore/Alphabet/libdasheralphabet.a 16 8479 bc99092 + DasherCore/Alphabet/libdasheralphabet.a \ 17 8479 bc99092 + Common/libdashermisc.a 18 8479 bc99092 endif 19 8479 bc99092 20 8479 bc99092 if DOQTE 21 9444 padraigo --- /usr/tmp/clean/dasher-4.2.0/Src/DasherCore/DasherView.h 2006-09-03 20:45:06.000000000 +0100 22 9444 padraigo +++ dasher-4.2.0/Src/DasherCore/DasherView.h 2006-10-10 12:00:53.169825000 +0100 23 9444 padraigo @@ -47,7 +47,7 @@ 24 8479 bc99092 /// mode). We should probably consider creating separate classes for 25 8479 bc99092 /// these. 26 8479 bc99092 27 8479 bc99092 -class Dasher::CDasherView:public CDasherComponent 28 8479 bc99092 +class Dasher::CDasherView:public Dasher::CDasherComponent 29 8479 bc99092 { 30 8479 bc99092 public: 31 8479 bc99092 32 9444 padraigo --- /usr/tmp/clean/dasher-4.2.0/Src/Gtk2/KeyboardHelper.h 2006-09-03 20:45:08.000000000 +0100 33 9444 padraigo +++ dasher-4.2.0/Src/Gtk2/KeyboardHelper.h 2006-10-10 12:00:53.181727000 +0100 34 9444 padraigo @@ -7,7 +7,7 @@ 35 8479 bc99092 public: 36 8479 bc99092 CKeyboardHelper(); 37 8479 bc99092 int ConvertKeycode(int iCode); 38 8479 bc99092 - int Grab(bool bGrab); 39 8479 bc99092 + void Grab(bool bGrab); 40 8479 bc99092 41 8479 bc99092 private: 42 8479 bc99092 std::map<int, int> m_mTable; 43 9444 padraigo --- /usr/tmp/clean/dasher-4.2.0/Src/Gtk2/dasher_main.cpp 2006-09-03 20:45:09.000000000 +0100 44 9444 padraigo +++ dasher-4.2.0/Src/Gtk2/dasher_main.cpp 2006-10-10 12:00:53.281237000 +0100 45 9444 padraigo @@ -1047,7 +1047,7 @@ 46 8479 bc99092 #endif 47 8479 bc99092 } 48 8479 bc99092 49 8479 bc99092 -gboolean dasher_main_alphabet_combo_changed(DasherMain *pSelf) { 50 8479 bc99092 +void dasher_main_alphabet_combo_changed(DasherMain *pSelf) { 51 8479 bc99092 DasherMainPrivate *pPrivate = (DasherMainPrivate *)(pSelf->private_data); 52 8479 bc99092 53 8479 bc99092 GtkTreeIter sIter; 54 9444 padraigo --- /usr/tmp/clean/dasher-4.2.0/Src/Gtk2/KeyboardHelper.cpp 2006-09-03 20:45:08.000000000 +0100 55 9444 padraigo +++ dasher-4.2.0/Src/Gtk2/KeyboardHelper.cpp 2006-10-10 12:00:53.282878000 +0100 56 9444 padraigo @@ -75,7 +75,7 @@ 57 8479 bc99092 return -1; 58 8479 bc99092 } 59 8479 bc99092 60 8479 bc99092 -int CKeyboardHelper::Grab(bool bGrab) { 61 8479 bc99092 +void CKeyboardHelper::Grab(bool bGrab) { 62 8479 bc99092 for(std::map<int,int>::iterator it(m_mTable.begin()); it != m_mTable.end(); ++it) { 63 8479 bc99092 GdkKeymapKey *pKeys; 64 8479 bc99092 int iKeysLength; 65 9444 padraigo --- /usr/tmp/clean/dasher-4.2.0/Src/DasherCore/SocketInputBase.cpp 2006-09-03 20:45:07.000000000 +0100 66 9444 padraigo +++ dasher-4.2.0/Src/DasherCore/SocketInputBase.cpp 2006-10-10 13:38:25.228048000 +0100 67 9444 padraigo @@ -11,6 +11,7 @@ 68 9444 padraigo #include <string.h> 69 9444 padraigo #include <errno.h> 70 9444 padraigo #include <stdarg.h> 71 8479 bc99092 +#include <unistd.h> 72 9444 padraigo #ifdef WIN32 73 9444 padraigo #include <winsock2.h> 74 9444 padraigo #define DASHER_SOCKET_CLOSE_FUNCTION closesocket 75 9444 padraigo --- /usr/tmp/clean/dasher-4.2.0/Src/DasherCore/DasherNode.h 2006-09-03 20:45:06.000000000 +0100 76 9444 padraigo +++ dasher-4.2.0/Src/DasherCore/DasherNode.h 2006-10-10 12:00:53.284902000 +0100 77 8803 dc144907 @@ -95,7 +95,7 @@ 78 8803 dc144907 return m_iColour; 79 8803 dc144907 } 80 8803 dc144907 81 8803 dc144907 - int SetColour(int iColour) { 82 8803 dc144907 + void SetColour(int iColour) { 83 8803 dc144907 m_iColour = iColour; 84 8803 dc144907 } 85 8803 dc144907 86 9444 padraigo --- /usr/tmp/clean/dasher-4.2.0/Src/Gtk2/Preferences.cpp 2006-09-03 20:45:09.000000000 +0100 87 9444 padraigo +++ dasher-4.2.0/Src/Gtk2/Preferences.cpp 2006-10-10 12:00:53.286106000 +0100 88 8803 dc144907 @@ -1151,6 +1151,7 @@ 89 8803 dc144907 90 8803 dc144907 extern "C" gboolean show_helper_window(GtkWidget *pWidget, gpointer *pUserData) { 91 8803 dc144907 gtk_window_present(GTK_WINDOW(*pUserData)); 92 8803 dc144907 + return TRUE; 93 8803 dc144907 } 94 8803 dc144907 95 8803 dc144907 extern "C" gboolean advanced_preferences_show(GtkWidget *widget, gpointer user_data) { 96
Indexes created Wed Nov 25 15:27:26 UTC 2009
Terms of Use |
Privacy |
Trademarks |
Copyright Policy |
Site Guidelines |
Help
Your use of this web site or any of its content or software indicates your agreement to be bound by these Terms of Use.
Copyright © 1995-2008 Sun Microsystems, Inc.