Changeset 10575

Timestamp:

02/07/10 03:31:29 (7 months ago)

Author:

tsee

Message:

submersible_toaster: I think this might resolve the issue with catching events from main

Location:

trunk/Padre/lib/Padre

Files:

• SlaveDriver.pm (modified) (1 diff)
• Task.pm (modified) (4 diffs)
• TaskManager.pm (modified) (2 diffs)

trunk/Padre/lib/Padre/SlaveDriver.pm

@@ -162 +162 @@
 
         # Set the thread-specific main-window pointer
-        my $main = Wx::wxTheApp->GetTopWindow();
-        $Padre::TaskManager::_main = $main;
+        my $main = Padre->ide->wx; 
 
         #warn threads->tid() . " -- Hi, I'm a thread.";

trunk/Padre/lib/Padre/Task.pm

@@ -169 +169 @@
                 if (not $event_hooks_initialized) {
                         $event_hooks_initialized = 1;
-                        my $main = Padre->ide->wx->main;
+                        my $main = Padre->ide->wx;
                         Wx::Event::EVT_COMMAND(
                                 $main,
@@ -425 +425 @@
 # The main-thread stdout hook
 sub _on_stdout {
-        my ( $main, $event ) = @_;
+        my ( $wx, $event ) = @_;
         @_ = (); # hack to avoid "Scalars leaked"
+        my $main = $wx->main;
         my $out = $main->output();
         $main->show_output(1);
@@ -436 +437 @@
 # The main-thread stderr hook
 sub _on_stderr {
-        my ( $main, $event ) = @_;
+        my ( $wx, $event ) = @_;
         @_ = (); # hack to avoid "Scalars leaked"
+        my $main = $wx->main;
         my $out = $main->output();
         $main->show_output(1);
@@ -532 +534 @@
 
         Wx::PostEvent(
-                $Padre::TaskManager::_main,
+                Padre->ide->wx,
                 Wx::PlThreadEvent->new( -1, $eventid, $data ),
         );

trunk/Padre/lib/Padre/TaskManager.pm

@@ -132 +132 @@
         }
 
-        my $main = Padre->ide->wx->main;
+        my $main = Padre->ide->wx;
         _init_events($main);
 
@@ -556 +556 @@
 
 sub on_task_start_event {
-        my ( $main, $event ) = @_; @_ = (); # hack to avoid "Scalars leaked"
+        my ( $wx, $event ) = @_; @_ = (); # hack to avoid "Scalars leaked"
                                             # TO DO/FIXME:
                                             # This should somehow get at the specific TaskManager object
                                             # instead of going through the Padre globals!
+        my $main = $wx->main;
         my $manager           = Padre->ide->task_manager;
         my $tid_and_task_type = $event->GetData();