Changeset 11056

Timestamp:

03/10/10 20:19:12 (2 years ago)

Author:

adamk

Message:

Add explicit dependencies for just barely enough of Wx to get the slave driver spawned (enough to make a couple of shared event objects)

File:

• trunk/Padre/lib/Padre/SlaveDriver.pm (modified) (4 diffs)

trunk/Padre/lib/Padre/SlaveDriver.pm

@@ -34 +34 @@
 =cut
 
-use 5.008;
+use 5.008005;
 use strict;
 use warnings;
-
-our $VERSION = '0.58';
-
-# According to Wx docs this MUST be loaded before Wx,
-# so this also happens in the script.
 use threads;
 use threads::shared;
+
+# This has a version to prevent known cases of people not upgrading
 use Thread::Queue 2.11;
+
+our $VERSION = '0.58';
 
 # This event is triggered by the worker thread main loop after
@@ -81 +80 @@
 
         # Wx must be loaded before this code fires
-        require Padre::Wx;
+        require Wx::Event;
         $TASK_DONE_EVENT  = Wx::NewEventType() unless defined $TASK_DONE_EVENT;
         $TASK_START_EVENT = Wx::NewEventType() unless defined $TASK_START_EVENT;
@@ -128 +127 @@
 
     require Storable;
-    $self->{cmd_queue}->enqueue( Storable::freeze( [ $task_manager->task_queue ] ) );
-
-    return threads->object( $self->{tid_queue}->dequeue );
+    $self->{cmd_queue}->enqueue(
+        Storable::freeze( [ $task_manager->task_queue ] )
+    );
+
+    return threads->object(
+        $self->{tid_queue}->dequeue
+    );
 }
 
@@ -240 +243 @@
     while ( my $args = $inqueue->dequeue ) { # args is frozen [$main, $queue]
         last if $args eq 'STOP';
-        my $task_queue = Padre::SlaveDriver->new->task_queue;
+        my $task_queue    = Padre::SlaveDriver->new->task_queue;
         my $worker_thread = threads->create( \&_worker_loop, $task_queue );
         $outqueue->enqueue( $worker_thread->tid );