From: <wda...@us...> - 2008-01-21 01:05:27
|
Revision: 2274 http://oorexx.svn.sourceforge.net/oorexx/?rev=2274&view=rev Author: wdashley Date: 2008-01-20 17:05:32 -0800 (Sun, 20 Jan 2008) Log Message: ----------- ArtifactID: None Comment: Fixed the problem with test4-10.rex. Modified Paths: -------------- sandbox/david/grxinterfaces.c sandbox/david/grxlabel.c sandbox/david/rexxgtk.cls Modified: sandbox/david/grxinterfaces.c =================================================================== --- sandbox/david/grxinterfaces.c 2008-01-20 23:28:59 UTC (rev 2273) +++ sandbox/david/grxinterfaces.c 2008-01-21 01:05:32 UTC (rev 2274) @@ -164,7 +164,7 @@ const char * Queuename, PRXSTRING Retstr) { GtkWidget *myWidget; - gchar * file = "\0"; + gchar * file; /* Check for valid arguments */ if (GrxCheckArgs(1, Argc, Argv)) { @@ -177,6 +177,9 @@ if (GTK_IS_WIDGET(GTK_OBJECT(myWidget))) { file = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(myWidget)); } + if (file == NULL) { + file = "\0"; + } /* Set up the REXX return code */ if (strlen(file) > RXAUTOBUFLEN) { Modified: sandbox/david/grxlabel.c =================================================================== --- sandbox/david/grxlabel.c 2008-01-20 23:28:59 UTC (rev 2273) +++ sandbox/david/grxlabel.c 2008-01-21 01:05:32 UTC (rev 2274) @@ -174,7 +174,7 @@ GtkWidget *myWidget; /* Check for valid arguments */ - if (GrxCheckArgs(2, Argc, Argv)) { + if (Argc != 2 || !RXVALIDSTRING(Argv[0])) { return RXFUNC_BADCALL; } Modified: sandbox/david/rexxgtk.cls =================================================================== --- sandbox/david/rexxgtk.cls 2008-01-20 23:28:59 UTC (rev 2273) +++ sandbox/david/rexxgtk.cls 2008-01-21 01:05:32 UTC (rev 2274) @@ -1038,13 +1038,16 @@ ::method connect_signal use strict arg event +-- first try the GtkFileChooser class hiearchy first +if self~connect_signal:.GtkFileChooser(event) = .true then return .true +-- now try the standard hiearchy select when event = 'file_set' then call GrxFileChooserButtonConnectSignal self~pointer, event otherwise return self~connect_signal:super(event) end return .true -::method signal_color_set +::method signal_file_set return @@ -1869,7 +1872,7 @@ return ::method filename -return GrxFileChooserGetFilename self~pointer +return GrxFileChooserGetFilename(self~pointer) ::method get_filename return self~filename @@ -1881,7 +1884,7 @@ when event = 'file_activated' then call GrxFileChooserConnectSignal self~pointer, event when event = 'selection_changed' then call GrxFileChooserConnectSignal self~pointer, event when event = 'update_preview' then call GrxFileChooserConnectSignal self~pointer, event - otherwise return .false -- this class has no parents + otherwise return .false -- this class has no parent end return .true This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |