Changeset 5393

Timestamp:

06/20/09 00:11:04 (3 years ago)

Author:

szabgab

Message:

fix "bad code" in Padre

Location:

trunk/Padre/lib/Padre/Wx

Files:

• Editor.pm (modified) (9 diffs)
• Output.pm (modified) (1 diff)

trunk/Padre/lib/Padre/Wx/Editor.pm

@@ -41 +41 @@
     # Create the underlying Wx object
     my $self   = $class->SUPER::new($notebook);
-    my $config = Padre->ide->config;
+    my $config = $self->main->ide->config;
 
     # TODO: Make this suck less
@@ -145 +145 @@
 sub padre_setup_plain {
     my $self   = shift;
-    my $config = Padre->ide->config;
+    my $config = $self->main->ide->config;
     $self->set_font;
     $self->StyleClearAll;
@@ -182 +182 @@
     my $self = shift;
     my $name = shift;
-    my $config = Padre->ide->config;
+    my $config = $self->main->ide->config;
 
     $self->padre_setup_plain;
@@ -372 +372 @@
 sub set_font {
     my $self   = shift;
-    my $config = Padre->ide->config;
+    my $config = $self->main->ide->config;
     my $font   = Wx::Font->new( 10, Wx::wxTELETYPE, Wx::wxNORMAL, Wx::wxNORMAL );
     if ( defined $config->editor_font && length $config->editor_font > 0 ) {    # empty default...
@@ -384 +384 @@
 sub set_preferences {
     my $self   = shift;
-    my $config = Padre->ide->config;
+    my $config = $self->main->ide->config;
 
     $self->show_line_numbers( $config->editor_linenumbers );
@@ -402 +402 @@
 sub show_calltip {
     my $self   = shift;
-    my $config = Padre->ide->config;
+    my $config = $self->main->ide->config;
     return unless $config->editor_calltips;
 
@@ -439 +439 @@
     my ( $self, $mode ) = @_;
 
-    my $config = Padre->ide->config;
+    my $config = $self->main->ide->config;
     return unless $config->editor_autoindent;
     return if $config->editor_autoindent eq 'no';
@@ -798 +798 @@
 
     if ( $event->isa('Wx::MouseEvent')
-        and Padre->ide->config->editor_folding )
+        and $self->main->ide->config->editor_folding )
     {
         my $mousePos         = $event->GetPosition;
@@ -851 +851 @@
     my $self  = shift;
     my $event = shift;
-    my $config = Padre->ide->config;
+    my $config = $self->main->ide->config;
 
     $event->Skip;

trunk/Padre/lib/Padre/Wx/Output.pm

@@ -66 +66 @@
 sub AppendText {
     my $self     = shift;
-    my $use_ansi = Padre->ide->config->main_output_ansi;
+    my $use_ansi = $self->main->ide->config->main_output_ansi;
     if ( utf8::is_utf8($_[0]) ) {
         if ( $use_ansi ) {