Changeset 10570

Timestamp:

02/07/10 03:28:33 (7 months ago)

Author:

tsee

Message:

init events later

Files:

• trunk/Padre/lib/Padre/Task.pm (modified) (3 diffs)

trunk/Padre/lib/Padre/Task.pm

@@ -119 +119 @@
 require Padre;
 require Padre::Wx;
+require Wx;
 
 BEGIN {
@@ -132 +133 @@
 };
 
-# set up the stdout/stderr printing events
+# set up the stdout/stderr printing events => initialized during run time
 our $STDOUT_EVENT : shared;
-BEGIN { $STDOUT_EVENT = Wx::NewEventType(); }
 our $STDERR_EVENT : shared;
-BEGIN { $STDERR_EVENT = Wx::NewEventType(); }
 
 =pod
@@ -156 +155 @@
 =cut
 
-SCOPE: {
-        my $events_initialized = 0;
-
-        sub schedule {
-                my $self = shift;
-                if ( !$events_initialized ) {
-                        my $main = Padre->ide->wx->main;
-                        Wx::Event::EVT_COMMAND(
-                                $main,
-                                -1,
-                                $STDOUT_EVENT,
-                                \&_on_stdout,
-                        );
-                        Wx::Event::EVT_COMMAND(
-                                $main,
-                                -1,
-                                $STDERR_EVENT,
-                                \&_on_stderr,
-                        );
-                        $events_initialized = 1;
-                }
-                Padre->ide->task_manager->schedule($self);
-        }
+sub schedule {
+        my $self = shift;
+        if ( not defined $STDOUT_EVENT ) {
+                $STDOUT_EVENT = Wx::NewEventType();
+                $STDERR_EVENT = Wx::NewEventType();
+                my $main = Padre->ide->wx->main;
+                Wx::Event::EVT_COMMAND(
+                        $main,
+                        -1,
+                        $STDOUT_EVENT,
+                        \&_on_stdout,
+                );
+                Wx::Event::EVT_COMMAND(
+                        $main,
+                        -1,
+                        $STDERR_EVENT,
+                        \&_on_stderr,
+                );
+        }
+        Padre->ide->task_manager->schedule($self);
 }