Changeset 472

Timestamp:

10/26/08 02:28:23 (3 years ago)

Author:

szabgab

Message:

remove the need for the _DOCUMENT helper function and replace it
with calls to Padre::Documents methods

Location:

trunk/lib/Padre/Wx

Files:

• Editor.pm (modified) (3 diffs)
• MainWindow.pm (modified) (5 diffs)

trunk/lib/Padre/Wx/Editor.pm

@@ -5 +5 @@
 use warnings;
 
+use Padre::Documents ();
 use Wx::STC;
 use Padre::Wx;
@@ -135 +136 @@
     my ( $self, $event ) = @_;
 
-    my $doc = Padre::Wx::MainWindow::_DOCUMENT() or return;
+    my $doc = Padre::Documents->current or return;
     if ($doc->can('colourise')) {
         $doc->colourise;
@@ -160 +161 @@
     }
 
-    my $doc = Padre::Wx::MainWindow::_DOCUMENT() or return;
+    my $doc = Padre::Documents->current or return;
     my $keywords = $doc->keywords;
 

trunk/lib/Padre/Wx/MainWindow.pm

@@ -644 +644 @@
     # Save the list of open files
     $config->{host}->{main_files} = [
-        map { $_->filename }
-        grep { $_ } map { _DOCUMENT($_) }
+        map  { $_->filename }
+        grep { $_ } 
+        map  { Padre::Documents->by_id($_) }
         $self->pageids
     ];
@@ -947 +948 @@
     my $page         = $self->{notebook}->GetPage($id);
     my $content      = $page->GetText;
-    my $doc          = _DOCUMENT($id) or return;
+    my $doc          = Padre::Documents->by_id($id) or return;
     my $filename     = $doc->filename;
     my $newline_type = $doc->get_newline_type;
@@ -1001 +1002 @@
     $self->{menu}->remove_alt_n_menu;
     foreach my $i ( 0 .. @{ $self->{menu}->{alt} } - 1 ) {
-        my $doc = _DOCUMENT($i) or return;
+        my $doc = Padre::Documents->by_id($i) or return;
         my $file = $doc->filename
             || $self->{notebook}->GetPageText($i);
@@ -1213 +1214 @@
     my ($self, $file) = @_;
     foreach my $id (0 .. $self->{notebook}->GetPageCount -1) {
-        my $doc = _DOCUMENT($id) or return;
+        my $doc = Padre::Documents->by_id($id) or return;
         my $filename = $doc->filename;
         next if not $filename;
@@ -1244 +1245 @@
 }
 
-sub _DOCUMENT {
-    return (defined $_[0]) ? Padre::Documents->by_id($_[0]) : Padre::Documents->current;
-}
-
 1;