Changeset 3370

Timestamp:

May 30, 2009, 8:57:08 AM (15 years ago)

Author:

ronosman

Message:

Fix DND regression in photo selection.

Location:

extensions/pLoader/trunk/src/Uploader/GUI

Files:

• wxApp.pm (modified) (2 diffs)
• wxFrameAUI.pm (modified) (4 diffs)

extensions/pLoader/trunk/src/Uploader/GUI/wxApp.pm

@@ -309 +309 @@
           login_dlg
           branding
+          frame
       / 
 );
@@ -904 +905 @@
     }
 
-    my ( $frame ) = Uploader::GUI::wxFrameAUI->new( 
-        {
-            x         => $x,
-            y         => $y,
-            width     => $w,
-            height    => $h,
-            title     => sprintf("pLoader - Piwigo uploader %s - [%s]", $self->version, $url),
-            pwg       => $self->pwg,
-            imagelist => $self->imagelist,
-            preview_w => $prev_w,
-            preview_h => $prev_h,
-            perspective => $perspective,
-            imageviewer_index => $imageviewer_index,
-        }
+    $self->frame(
+        Uploader::GUI::wxFrameAUI->new( 
+            {
+                x         => $x,
+                y         => $y,
+                width     => $w,
+                height    => $h,
+                title     => sprintf("pLoader - Piwigo uploader %s - [%s]", $self->version, $url),
+                pwg       => $self->pwg,
+                imagelist => $self->imagelist,
+                preview_w => $prev_w,
+                preview_h => $prev_h,
+                perspective => $perspective,
+                imageviewer_index => $imageviewer_index,
+            }
+        )
     );
         
-    $frame->SetSize( $x, $y, $w, $h );
-    $frame->Show( 1 );
-    $self->SetTopWindow( $frame );
+    $self->frame->SetSize( $x, $y, $w, $h );
+    $self->frame->Show( 1 );
+    $self->SetTopWindow( $self->frame );
 
     my $icon = Wx::Icon->new();
     $icon->LoadFile('../res/favicon.ico', wxBITMAP_TYPE_ICO);
-    $frame->SetIcon($icon);     
+    $self->frame->SetIcon($icon);       
 }
 

extensions/pLoader/trunk/src/Uploader/GUI/wxFrameAUI.pm

@@ -1966 +1966 @@
 
 package DNDImageListDropTarget;
-
+use Wx qw/wxTheApp/;
 use base qw(Wx::FileDropTarget Class::Accessor::Fast);
 
@@ -1972 +1972 @@
     qw/
           imageviewer
-          frame
       /
 );
@@ -1982 +1981 @@
 
   $self->imageviewer($imageviewer);
-  $self->frame($imageviewer->GetParent);
+
   return $self;
 }
@@ -1989 +1988 @@
   my( $self, $x, $y, $files ) = @_;
 
-  $self->frame->SetNewFiles($files) ;
+  wxTheApp->frame->SetNewFiles($files) ;
 }