Removed some trash from that came through tha cables

  Fixed Blit probs
  Fixed file dlg probs
  Fixed TextCtrl probs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 1aef2bffabc1180bbf4ec33b2a07eacb3c706e3b..588bc7527c30040e1ca8bfb894201faa2cb190f7 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -387,19 +387,13 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
 
 #endif
 
 
 #endif
 

-  wxButton *button = (wxButton*)NULL;
-
-//  m_notebook->SetBackgroundColour("cadet blue");
-
+  wxButton *button = (wxButton*) NULL;  /* who did this ? */

   wxPanel *panel = (wxPanel*) NULL;
 
   panel = new wxPanel(m_notebook);
   wxPanel *panel = (wxPanel*) NULL;
 
   panel = new wxPanel(m_notebook);

-//  panel->SetBackgroundColour("cadet blue");
-//  panel->SetForegroundColour("blue");

   m_listbox = new wxListBox( panel, ID_LISTBOX, wxPoint(10,10), wxSize(120,70), 5, choices );
   m_listbox->SetToolTip( "This is a list box" );
 
   m_listbox = new wxListBox( panel, ID_LISTBOX, wxPoint(10,10), wxSize(120,70), 5, choices );
   m_listbox->SetToolTip( "This is a list box" );
 

-//  m_listbox->SetBackgroundColour("wheat");

   (void)new wxButton( panel, ID_LISTBOX_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_LISTBOX_SEL_STR, "Select 'This'", wxPoint(340,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_LISTBOX_CLEAR, "Clear", wxPoint(180,80), wxSize(140,30) );
   (void)new wxButton( panel, ID_LISTBOX_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_LISTBOX_SEL_STR, "Select 'This'", wxPoint(340,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_LISTBOX_CLEAR, "Clear", wxPoint(180,80), wxSize(140,30) );


@@ -408,17 +402,13 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
   button = new wxButton( panel, ID_LISTBOX_FONT, "Set Italic font", wxPoint(340,130), wxSize(140,30) );
   button->SetToolTip( "Press here to set italic font" );
 
   button = new wxButton( panel, ID_LISTBOX_FONT, "Set Italic font", wxPoint(340,130), wxSize(140,30) );
   button->SetToolTip( "Press here to set italic font" );
 

-//  button->SetForegroundColour( "red" );

   m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, "Disable", wxPoint(20,130), wxSize(140,30) );
   m_checkbox->SetValue(FALSE);
   m_checkbox->SetToolTip( "Click here to disable the listbox" );
   m_notebook->AddPage(panel, "wxList", TRUE, Image_List);
 
   panel = new wxPanel(m_notebook);
   m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, "Disable", wxPoint(20,130), wxSize(140,30) );
   m_checkbox->SetValue(FALSE);
   m_checkbox->SetToolTip( "Click here to disable the listbox" );
   m_notebook->AddPage(panel, "wxList", TRUE, Image_List);
 
   panel = new wxPanel(m_notebook);

-//  panel->SetBackgroundColour("cadet blue");
-//  panel->SetForegroundColour("blue");

   m_choice = new wxChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,-1), 5, choices );
   m_choice = new wxChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,-1), 5, choices );

-//  m_choice->SetBackgroundColour("wheat");

   (void)new wxButton( panel, ID_CHOICE_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_CHOICE_SEL_STR, "Select 'This'", wxPoint(340,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_CHOICE_CLEAR, "Clear", wxPoint(180,80), wxSize(140,30) );
   (void)new wxButton( panel, ID_CHOICE_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_CHOICE_SEL_STR, "Select 'This'", wxPoint(340,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_CHOICE_CLEAR, "Clear", wxPoint(180,80), wxSize(140,30) );


@@ -429,10 +419,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
   m_notebook->AddPage(panel, "wxChoice", FALSE, Image_Choice);
 
   panel = new wxPanel(m_notebook);
   m_notebook->AddPage(panel, "wxChoice", FALSE, Image_Choice);
 
   panel = new wxPanel(m_notebook);

-//  panel->SetBackgroundColour("cadet blue");
-//  panel->SetForegroundColour("blue");

   m_combo = new wxComboBox( panel, ID_COMBO, "This", wxPoint(10,10), wxSize(120,-1), 5, choices );
   m_combo = new wxComboBox( panel, ID_COMBO, "This", wxPoint(10,10), wxSize(120,-1), 5, choices );

-//  m_combo->SetBackgroundColour("wheat");

   (void)new wxButton( panel, ID_COMBO_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_COMBO_SEL_STR, "Select 'This'", wxPoint(340,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_COMBO_CLEAR, "Clear", wxPoint(180,80), wxSize(140,30) );
   (void)new wxButton( panel, ID_COMBO_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_COMBO_SEL_STR, "Select 'This'", wxPoint(340,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_COMBO_CLEAR, "Clear", wxPoint(180,80), wxSize(140,30) );


@@ -443,21 +430,14 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
   m_notebook->AddPage(panel, "wxComboBox", FALSE, Image_Combo);
 
   panel = new wxPanel(m_notebook);
   m_notebook->AddPage(panel, "wxComboBox", FALSE, Image_Combo);
 
   panel = new wxPanel(m_notebook);

-//  panel->SetBackgroundColour("cadet blue");
-//  panel->SetForegroundColour("blue");
-  m_textentry = new MyTextCtrl( panel, -1, "Write text here.",
-                                wxPoint(10,10), wxSize(320,28),
+  m_textentry = new MyTextCtrl( panel, -1, "Write text here.", wxPoint(10,10), wxSize(320,28),

                                 wxTE_PROCESS_ENTER);
   (*m_textentry) << " More text.";
                                 wxTE_PROCESS_ENTER);
   (*m_textentry) << " More text.";

-//  m_textentry->SetBackgroundColour("wheat");
-  m_multitext = new MyTextCtrl( panel, ID_TEXT, "And here.",
-                                wxPoint(10,50), wxSize(320,80),
+  m_multitext = new MyTextCtrl( panel, ID_TEXT, "And here.", wxPoint(10,50), wxSize(320,70),

                                 wxTE_MULTILINE );
                                 wxTE_MULTILINE );

-  (*m_multitext) << " More text."
-                 << "\nPress Fn keys to test different wxTextCtrl functions";
-//  m_multitext->SetBackgroundColour("wheat");
-  (void)new MyTextCtrl( panel, -1, "This one is with wxTE_PROCESS_TAB style.",
-                        wxPoint(10,140), wxSize(320,80), wxTE_MULTILINE | wxTE_PROCESS_TAB);
+  (*m_multitext) << " More text.\nPress function keys to test different \nwxTextCtrl functions.";
+  new MyTextCtrl( panel, -1, "This one is with wxTE_PROCESS_TAB style.",
+                             wxPoint(10,120), wxSize(320,70), wxTE_MULTILINE | wxTE_PROCESS_TAB);

 
   (void)new wxStaticBox( panel, -1, "&Move cursor to the end of:",
                          wxPoint(345, 0), wxSize(160, 100) );
 
   (void)new wxStaticBox( panel, -1, "&Move cursor to the end of:",
                          wxPoint(345, 0), wxSize(160, 100) );


@@ -465,9 +445,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
                      wxPoint(370, 20), wxSize(110, 30));
   (void)new wxButton(panel, ID_MOVE_END_ZONE, "Text &zone",
                      wxPoint(370, 60), wxSize(110, 30));
                      wxPoint(370, 20), wxSize(110, 30));
   (void)new wxButton(panel, ID_MOVE_END_ZONE, "Text &zone",
                      wxPoint(370, 60), wxSize(110, 30));

-  (void)new wxStaticBox( panel, -1, "wx&Clipboard", wxPoint(345,120), wxSize(160,100) );
-  (void)new wxButton( panel, ID_COPY_TEXT, "C&opy line 1", wxPoint(370,140), wxSize(110,30) );
-  (void)new wxButton( panel, ID_PASTE_TEXT, "&Paste text", wxPoint(370,180), wxSize(110,30) );
+  (void)new wxStaticBox( panel, -1, "wx&Clipboard", wxPoint(338,120), wxSize(160,100) );
+  (void)new wxButton( panel, ID_COPY_TEXT, "C&opy line 1", wxPoint(362,140), wxSize(110,30) );
+  (void)new wxButton( panel, ID_PASTE_TEXT, "&Paste text", wxPoint(362,180), wxSize(110,30) );

   m_notebook->AddPage(panel, "wxTextCtrl" , FALSE, Image_Text);
 
   wxString choices2[] =
   m_notebook->AddPage(panel, "wxTextCtrl" , FALSE, Image_Text);
 
   wxString choices2[] =


@@ -477,15 +457,11 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
   };
 
   panel = new wxPanel(m_notebook);
   };
 
   panel = new wxPanel(m_notebook);

-//  panel->SetBackgroundColour("cadet blue");
-//  panel->SetForegroundColour("blue");

   (void)new wxRadioBox( panel, ID_RADIOBOX, "That", wxPoint(10,160), wxSize(-1,-1), 2, choices2, 1, wxRA_SPECIFY_ROWS );
   (void)new wxRadioBox( panel, ID_RADIOBOX, "That", wxPoint(10,160), wxSize(-1,-1), 2, choices2, 1, wxRA_SPECIFY_ROWS );

-  m_radio = new wxRadioBox( panel, ID_RADIOBOX, "This", wxPoint(10,10), wxSize(-1,-1), 5, choices, 2, wxRA_SPECIFY_COLS );
-//  m_radio->SetBackgroundColour("wheat");
+  m_radio = new wxRadioBox( panel, ID_RADIOBOX, "This", wxPoint(10,10), wxSize(-1,-1), 5, choices, 1, wxRA_SPECIFY_COLS );

   (void)new wxButton( panel, ID_RADIOBOX_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_RADIOBOX_SEL_STR, "Select 'This'", wxPoint(180,80), wxSize(140,30) );
   m_fontButton = new wxButton( panel, ID_SET_FONT, "Set more Italic font", wxPoint(340,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_RADIOBOX_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
   (void)new wxButton( panel, ID_RADIOBOX_SEL_STR, "Select 'This'", wxPoint(180,80), wxSize(140,30) );
   m_fontButton = new wxButton( panel, ID_SET_FONT, "Set more Italic font", wxPoint(340,30), wxSize(140,30) );

-//  m_fontButton->SetForegroundColour("blue");

   (void)new wxButton( panel, ID_RADIOBOX_FONT, "Set Italic font", wxPoint(340,80), wxSize(140,30) );
   (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, "Disable", wxPoint(340,130), wxSize(140,30) );
   wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, "Radiobutton1", wxPoint(210,170), wxSize(110,30) );
   (void)new wxButton( panel, ID_RADIOBOX_FONT, "Set Italic font", wxPoint(340,80), wxSize(140,30) );
   (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, "Disable", wxPoint(340,130), wxSize(140,30) );
   wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, "Radiobutton1", wxPoint(210,170), wxSize(110,30) );


@@ -494,13 +470,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
   m_notebook->AddPage(panel, "wxRadioBox", FALSE, Image_Radio);
 
   panel = new wxPanel(m_notebook);
   m_notebook->AddPage(panel, "wxRadioBox", FALSE, Image_Radio);
 
   panel = new wxPanel(m_notebook);

-//  panel->SetBackgroundColour("cadet blue");
-//  panel->SetForegroundColour("blue");

   (void)new wxStaticBox( panel, -1, "wxGauge and wxSlider", wxPoint(10,10), wxSize(180,130) );
   m_gauge = new wxGauge( panel, -1, 200, wxPoint(18,50), wxSize(155, 30) );
   (void)new wxStaticBox( panel, -1, "wxGauge and wxSlider", wxPoint(10,10), wxSize(180,130) );
   m_gauge = new wxGauge( panel, -1, 200, wxPoint(18,50), wxSize(155, 30) );

-//  m_gauge->SetBackgroundColour("wheat");

   m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, wxPoint(18,90), wxSize(155,-1) );
   m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, wxPoint(18,90), wxSize(155,-1) );

-//  m_slider->SetBackgroundColour("wheat");

   (void)new wxStaticBox( panel, -1, "Explanation", wxPoint(200,10), wxSize(290,130) );
 #ifdef __WXMOTIF__
   // No wrapping text in wxStaticText yet :-(
   (void)new wxStaticBox( panel, -1, "Explanation", wxPoint(200,10), wxSize(290,130) );
 #ifdef __WXMOTIF__
   // No wrapping text in wxStaticText yet :-(


@@ -518,15 +490,12 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
     "This is also supposed to demonstrate how\n"
     "to use static controls.\n",
     wxPoint(208,25),
     "This is also supposed to demonstrate how\n"
     "to use static controls.\n",
     wxPoint(208,25),

-    wxSize(210, 110)
+    wxSize(250, 110)

     );
 #endif
   m_spintext = new wxTextCtrl( panel, -1, "0", wxPoint(20,160), wxSize(80,-1) );
     );
 #endif
   m_spintext = new wxTextCtrl( panel, -1, "0", wxPoint(20,160), wxSize(80,-1) );

-//  m_spintext->SetBackgroundColour("wheat");

   m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,159), wxSize(-1,-1) );
   m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,159), wxSize(-1,-1) );

-//  m_spinbutton->SetBackgroundColour("wheat");

   m_spinbutton->SetRange(0,100);
   m_spinbutton->SetRange(0,100);

-

   m_notebook->AddPage(panel, "wxGauge", FALSE, Image_Gauge);
 }
 
   m_notebook->AddPage(panel, "wxGauge", FALSE, Image_Gauge);
 }
 


@@ -658,13 +627,11 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
     case ID_LISTBOX_ENABLE:
     {
       m_text->WriteText("Checkbox clicked.\n");
     case ID_LISTBOX_ENABLE:
     {
       m_text->WriteText("Checkbox clicked.\n");

-#ifdef __WXGTK__

       wxCheckBox *cb = (wxCheckBox*)event.GetEventObject();
       if (event.GetInt())
         cb->SetToolTip( "Click to enable listbox" );
       else
         cb->SetToolTip( "Click to disable listbox" );
       wxCheckBox *cb = (wxCheckBox*)event.GetEventObject();
       if (event.GetInt())
         cb->SetToolTip( "Click to enable listbox" );
       else
         cb->SetToolTip( "Click to disable listbox" );

-#endif

       m_listbox->Enable( event.GetInt() == 0 );
       break;
     }
       m_listbox->Enable( event.GetInt() == 0 );
       break;
     }

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index f1af921f28aa8f5043dd8af3a1247732b3d48f75..7e9d82bd1608f71c04f5e91e881b75832b5f75f9 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -588,12 +588,12 @@ bool wxWindowDC::Blit( long xdest, long ydest, long width, long height,
             }
            
             gdk_draw_pixmap( m_window, m_penGC, pmap,
             }
            
             gdk_draw_pixmap( m_window, m_penGC, pmap,

-                             source->DeviceToLogicalX(xsrc), 
-                            source->DeviceToLogicalY(ysrc),
+                             source->LogicalToDeviceX(xsrc), 
+                            source->LogicalToDeviceY(ysrc),

                              xx, 
                             yy,
                              xx, 
                             yy,

-                             source->DeviceToLogicalXRel(width), 
-                            source->DeviceToLogicalYRel(height) );
+                             source->LogicalToDeviceXRel(width), 
+                            source->LogicalToDeviceYRel(height) );

          
             if (useMask && mask) 
             {
          
             if (useMask && mask) 
             {


@@ -621,12 +621,12 @@ bool wxWindowDC::Blit( long xdest, long ydest, long width, long height,
             }
   
             gdk_draw_bitmap( m_window, m_textGC, bmap,
             }
   
             gdk_draw_bitmap( m_window, m_textGC, bmap,

-                             source->DeviceToLogicalX(xsrc), 
-                            source->DeviceToLogicalY(ysrc),
+                             source->LogicalToDeviceX(xsrc), 
+                            source->LogicalToDeviceY(ysrc),

                              xx, 
                             yy,
                              xx, 
                             yy,

-                             source->DeviceToLogicalXRel(width), 
-                            source->DeviceToLogicalYRel(height) );
+                             source->LogicalToDeviceXRel(width), 
+                            source->LogicalToDeviceYRel(height) );

          
             if (useMask && mask) 
             {
          
             if (useMask && mask) 
             {


@@ -642,10 +642,10 @@ bool wxWindowDC::Blit( long xdest, long ydest, long width, long height,
     gdk_window_copy_area ( m_window, m_penGC,
                            XLOG2DEV(xdest), YLOG2DEV(ydest),
                            csrc->GetWindow(),
     gdk_window_copy_area ( m_window, m_penGC,
                            XLOG2DEV(xdest), YLOG2DEV(ydest),
                            csrc->GetWindow(),

-                           source->DeviceToLogicalX(xsrc), 
-                          source->DeviceToLogicalY(ysrc),
-                           source->DeviceToLogicalXRel(width), 
-                          source->DeviceToLogicalYRel(height) );
+                           source->LogicalToDeviceX(xsrc), 
+                          source->LogicalToDeviceY(ysrc),
+                           source->LogicalToDeviceXRel(width), 
+                          source->LogicalToDeviceYRel(height) );

 
     SetLogicalFunction( old_logical_func );
     return TRUE;
 
     SetLogicalFunction( old_logical_func );
     return TRUE;

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index f33c3423c70cfbe90cf6768fede60f3dc6182982..a3e60fe420ebcf84c2d433f28ba6d05fa5f66b88 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -19,9 +19,29 @@
 #include "gtk/gtk.h"
 
 //-----------------------------------------------------------------------------
 #include "gtk/gtk.h"
 
 //-----------------------------------------------------------------------------

-// wxFileDialog
+// "delete_event"
+//-----------------------------------------------------------------------------
+
+static 
+bool gtk_filedialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
+{ 
+/*
+    printf( "OnDelete from " );
+    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
+        printf( win->GetClassInfo()->GetClassName() );
+    printf( ".\n" );
+*/
+  
+    win->Close();
+
+    return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// "clicked" for OK-button

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

+static 

 void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data )
 {
     wxFileDialog *dialog = (wxFileDialog*)data;
 void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data )
 {
     wxFileDialog *dialog = (wxFileDialog*)data;


@@ -43,6 +63,11 @@ void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data )
     dialog->OnOK( event );
 }
 
     dialog->OnOK( event );
 }
 

+//-----------------------------------------------------------------------------
+// "clicked" for Cancel-button
+//-----------------------------------------------------------------------------
+
+static 

 void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(widget), gpointer data )
 {
     wxFileDialog *dialog = (wxFileDialog*)data;
 void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(widget), gpointer data )
 {
     wxFileDialog *dialog = (wxFileDialog*)data;


@@ -50,6 +75,10 @@ void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(widget), gpointer data
     dialog->OnCancel( event );
 }
 
     dialog->OnCancel( event );
 }
 

+//-----------------------------------------------------------------------------
+// wxFileDialog
+//-----------------------------------------------------------------------------
+

 IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxDialog)
 
 wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxDialog)
 
 wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,


@@ -87,6 +116,10 @@ wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
 
     gtk_signal_connect( GTK_OBJECT(sel->cancel_button), "clicked",
       GTK_SIGNAL_FUNC(gtk_filedialog_cancel_callback), (gpointer*)this );
 
     gtk_signal_connect( GTK_OBJECT(sel->cancel_button), "clicked",
       GTK_SIGNAL_FUNC(gtk_filedialog_cancel_callback), (gpointer*)this );

+
+    gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", 
+        GTK_SIGNAL_FUNC(gtk_filedialog_delete_callback), (gpointer)this );
+    

 }
 
 int wxFileDialog::ShowModal(void)
 }
 
 int wxFileDialog::ShowModal(void)

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 9571b5e29b60eafef19f478d18b08b2ca23854e1..436ae7f1d6fbbb5591384d9d7935e11a4f517df7 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -17,7 +17,10 @@
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/checklst.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/checklst.h"

+
+#if wxUSE_TOOLTIPS

 #include "wx/tooltip.h"
 #include "wx/tooltip.h"

+#endif

 
 #if wxUSE_DRAG_AND_DROP
 #include "wx/dnd.h"
 
 #if wxUSE_DRAG_AND_DROP
 #include "wx/dnd.h"


@@ -347,7 +350,9 @@ void wxListBox::AppendCommon( const wxString &item )
 #endif
 #endif
 
 #endif
 #endif
 

+#if wxUSE_TOOLTIPS

     if (m_toolTip) m_toolTip->Apply( this );
     if (m_toolTip) m_toolTip->Apply( this );

+#endif

 }
 
 void wxListBox::Append( const wxString &item )
 }
 
 void wxListBox::Append( const wxString &item )

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 884e21b6009a2ad7aef0c1257aef216315fd6c4a..cc172bce3c2494af44c03ca0b85d0bd041bf05e0 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -182,11 +182,17 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
     gtk_signal_connect( GTK_OBJECT(m_text), "changed",
       GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
 
     gtk_signal_connect( GTK_OBJECT(m_text), "changed",
       GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
 

-    if (!value.IsNull())
+    if (!value.IsEmpty())

     {
         gint tmp = 0;
         gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
     {
         gint tmp = 0;
         gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );

-        SetInsertionPointEnd();
+       
+        if (multi_line)
+        {
+           /* bring editable's cursor uptodate. bug in GTK. */
+       
+           GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
+       }

     }
 
     if (style & wxTE_PASSWORD)
     }
 
     if (style & wxTE_PASSWORD)


@@ -286,12 +292,16 @@ void wxTextCtrl::WriteText( const wxString &text )
 
     if (m_windowStyle & wxTE_MULTILINE)
     {
 
     if (m_windowStyle & wxTE_MULTILINE)
     {

-        //gint len = gtk_text_get_length( GTK_TEXT(m_text) );
-        // Find the current insertion point 
+        /* this moves the cursor pos to behind the inserted text */
+       

        gint len = GTK_EDITABLE(m_text)->current_pos;
        gint len = GTK_EDITABLE(m_text)->current_pos;

-       // Insert text at this point
+

         gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
         gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );

-       // Note: the insertion point is now at 'len' (past our insertion).
+       
+       /* bring editable's cursor uptodate. bug in GTK. */
+       
+       GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
+    

     }
     else
     {
     }
     else
     {


@@ -527,22 +537,35 @@ int wxTextCtrl::GetNumberOfLines() const
 
 void wxTextCtrl::SetInsertionPoint( long pos )
 {
 
 void wxTextCtrl::SetInsertionPoint( long pos )
 {

-    int len;

     wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
     wxCHECK_RET( m_text != NULL, "invalid text ctrl" );

-    if (m_windowStyle & wxTE_MULTILINE) {
-        //gtk_text_set_point( GTK_TEXT(m_text), (int)pos );
-        /* HH: The call commented out above doesn't do anything. Don't know
-        * why. The code below isn't perfect either; it doesn't move the
-        * actual cursor, but subsequent calls to WriteText will insert
-        * text at the set position and move the displayed cursor behind it as 
-        * well. I guess this is good enough for most uses. */
-        len = gtk_text_get_length( GTK_TEXT(m_text) );
-       if ( (pos < 0) || (pos > len) )
-         pos = len;
-       GTK_EDITABLE(m_text)->current_pos = (int)pos;
+    
+    if (m_windowStyle & wxTE_MULTILINE) 
+    {
+        /* seems to be broken in GTK 1.0.X:
+          gtk_text_set_point( GTK_TEXT(m_text), (int)pos ); */
+      
+        gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
+          GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+      
+        /* we fake a set_point by inserting and deleting. as the user
+          isn't supposed to get to know about thos non-sense, we
+          disconnect so that no events are sent to the user program. */
+      
+        gint tmp = (gint)pos;
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), " ", 1, &tmp );
+       gtk_editable_delete_text( GTK_EDITABLE(m_text), tmp-1, tmp );
+       
+        gtk_signal_connect( GTK_OBJECT(m_text), "changed",
+          GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+         
+       /* bring editable's cursor uptodate. another bug in GTK. */
+       
+       GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );

     }
     else
     }
     else

+    {

         gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos );
         gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos );

+    }

 }
 
 void wxTextCtrl::SetInsertionPointEnd()
 }
 
 void wxTextCtrl::SetInsertionPointEnd()

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index b76cdfa686991863daf66a23bd3c149613525ff7..90bf2685d166583641f820a6b94e0cd802708273 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -347,7 +347,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
     }
 
     // win is a control: tab can be propagated up
     }
 
     // win is a control: tab can be propagated up

-    if ((!ret) && (gdk_event->keyval == GDK_Tab))
+    if ((!ret) && (gdk_event->keyval == GDK_Tab) && ((win->m_windowStyle & wxTE_PROCESS_TAB) == 0))

     {
         wxNavigationKeyEvent new_event;
         new_event.SetDirection( !(gdk_event->state & GDK_SHIFT_MASK) );
     {
         wxNavigationKeyEvent new_event;
         new_event.SetDirection( !(gdk_event->state & GDK_SHIFT_MASK) );

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index f1af921f28aa8f5043dd8af3a1247732b3d48f75..7e9d82bd1608f71c04f5e91e881b75832b5f75f9 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -588,12 +588,12 @@ bool wxWindowDC::Blit( long xdest, long ydest, long width, long height,
             }
            
             gdk_draw_pixmap( m_window, m_penGC, pmap,
             }
            
             gdk_draw_pixmap( m_window, m_penGC, pmap,

-                             source->DeviceToLogicalX(xsrc), 
-                            source->DeviceToLogicalY(ysrc),
+                             source->LogicalToDeviceX(xsrc), 
+                            source->LogicalToDeviceY(ysrc),

                              xx, 
                             yy,
                              xx, 
                             yy,

-                             source->DeviceToLogicalXRel(width), 
-                            source->DeviceToLogicalYRel(height) );
+                             source->LogicalToDeviceXRel(width), 
+                            source->LogicalToDeviceYRel(height) );

          
             if (useMask && mask) 
             {
          
             if (useMask && mask) 
             {


@@ -621,12 +621,12 @@ bool wxWindowDC::Blit( long xdest, long ydest, long width, long height,
             }
   
             gdk_draw_bitmap( m_window, m_textGC, bmap,
             }
   
             gdk_draw_bitmap( m_window, m_textGC, bmap,

-                             source->DeviceToLogicalX(xsrc), 
-                            source->DeviceToLogicalY(ysrc),
+                             source->LogicalToDeviceX(xsrc), 
+                            source->LogicalToDeviceY(ysrc),

                              xx, 
                             yy,
                              xx, 
                             yy,

-                             source->DeviceToLogicalXRel(width), 
-                            source->DeviceToLogicalYRel(height) );
+                             source->LogicalToDeviceXRel(width), 
+                            source->LogicalToDeviceYRel(height) );

          
             if (useMask && mask) 
             {
          
             if (useMask && mask) 
             {


@@ -642,10 +642,10 @@ bool wxWindowDC::Blit( long xdest, long ydest, long width, long height,
     gdk_window_copy_area ( m_window, m_penGC,
                            XLOG2DEV(xdest), YLOG2DEV(ydest),
                            csrc->GetWindow(),
     gdk_window_copy_area ( m_window, m_penGC,
                            XLOG2DEV(xdest), YLOG2DEV(ydest),
                            csrc->GetWindow(),

-                           source->DeviceToLogicalX(xsrc), 
-                          source->DeviceToLogicalY(ysrc),
-                           source->DeviceToLogicalXRel(width), 
-                          source->DeviceToLogicalYRel(height) );
+                           source->LogicalToDeviceX(xsrc), 
+                          source->LogicalToDeviceY(ysrc),
+                           source->LogicalToDeviceXRel(width), 
+                          source->LogicalToDeviceYRel(height) );

 
     SetLogicalFunction( old_logical_func );
     return TRUE;
 
     SetLogicalFunction( old_logical_func );
     return TRUE;

diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp
index f33c3423c70cfbe90cf6768fede60f3dc6182982..a3e60fe420ebcf84c2d433f28ba6d05fa5f66b88 100644 (file)
--- a/src/gtk1/filedlg.cpp
+++ b/src/gtk1/filedlg.cpp
@@ -19,9 +19,29 @@
 #include "gtk/gtk.h"
 
 //-----------------------------------------------------------------------------
 #include "gtk/gtk.h"
 
 //-----------------------------------------------------------------------------

-// wxFileDialog
+// "delete_event"
+//-----------------------------------------------------------------------------
+
+static 
+bool gtk_filedialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
+{ 
+/*
+    printf( "OnDelete from " );
+    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
+        printf( win->GetClassInfo()->GetClassName() );
+    printf( ".\n" );
+*/
+  
+    win->Close();
+
+    return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// "clicked" for OK-button

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

+static 

 void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data )
 {
     wxFileDialog *dialog = (wxFileDialog*)data;
 void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data )
 {
     wxFileDialog *dialog = (wxFileDialog*)data;


@@ -43,6 +63,11 @@ void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data )
     dialog->OnOK( event );
 }
 
     dialog->OnOK( event );
 }
 

+//-----------------------------------------------------------------------------
+// "clicked" for Cancel-button
+//-----------------------------------------------------------------------------
+
+static 

 void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(widget), gpointer data )
 {
     wxFileDialog *dialog = (wxFileDialog*)data;
 void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(widget), gpointer data )
 {
     wxFileDialog *dialog = (wxFileDialog*)data;


@@ -50,6 +75,10 @@ void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(widget), gpointer data
     dialog->OnCancel( event );
 }
 
     dialog->OnCancel( event );
 }
 

+//-----------------------------------------------------------------------------
+// wxFileDialog
+//-----------------------------------------------------------------------------
+

 IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxDialog)
 
 wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxDialog)
 
 wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,


@@ -87,6 +116,10 @@ wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
 
     gtk_signal_connect( GTK_OBJECT(sel->cancel_button), "clicked",
       GTK_SIGNAL_FUNC(gtk_filedialog_cancel_callback), (gpointer*)this );
 
     gtk_signal_connect( GTK_OBJECT(sel->cancel_button), "clicked",
       GTK_SIGNAL_FUNC(gtk_filedialog_cancel_callback), (gpointer*)this );

+
+    gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", 
+        GTK_SIGNAL_FUNC(gtk_filedialog_delete_callback), (gpointer)this );
+    

 }
 
 int wxFileDialog::ShowModal(void)
 }
 
 int wxFileDialog::ShowModal(void)

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 9571b5e29b60eafef19f478d18b08b2ca23854e1..436ae7f1d6fbbb5591384d9d7935e11a4f517df7 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -17,7 +17,10 @@
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/checklst.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/checklst.h"

+
+#if wxUSE_TOOLTIPS

 #include "wx/tooltip.h"
 #include "wx/tooltip.h"

+#endif

 
 #if wxUSE_DRAG_AND_DROP
 #include "wx/dnd.h"
 
 #if wxUSE_DRAG_AND_DROP
 #include "wx/dnd.h"


@@ -347,7 +350,9 @@ void wxListBox::AppendCommon( const wxString &item )
 #endif
 #endif
 
 #endif
 #endif
 

+#if wxUSE_TOOLTIPS

     if (m_toolTip) m_toolTip->Apply( this );
     if (m_toolTip) m_toolTip->Apply( this );

+#endif

 }
 
 void wxListBox::Append( const wxString &item )
 }
 
 void wxListBox::Append( const wxString &item )

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 884e21b6009a2ad7aef0c1257aef216315fd6c4a..cc172bce3c2494af44c03ca0b85d0bd041bf05e0 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -182,11 +182,17 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
     gtk_signal_connect( GTK_OBJECT(m_text), "changed",
       GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
 
     gtk_signal_connect( GTK_OBJECT(m_text), "changed",
       GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
 

-    if (!value.IsNull())
+    if (!value.IsEmpty())

     {
         gint tmp = 0;
         gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
     {
         gint tmp = 0;
         gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );

-        SetInsertionPointEnd();
+       
+        if (multi_line)
+        {
+           /* bring editable's cursor uptodate. bug in GTK. */
+       
+           GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
+       }

     }
 
     if (style & wxTE_PASSWORD)
     }
 
     if (style & wxTE_PASSWORD)


@@ -286,12 +292,16 @@ void wxTextCtrl::WriteText( const wxString &text )
 
     if (m_windowStyle & wxTE_MULTILINE)
     {
 
     if (m_windowStyle & wxTE_MULTILINE)
     {

-        //gint len = gtk_text_get_length( GTK_TEXT(m_text) );
-        // Find the current insertion point 
+        /* this moves the cursor pos to behind the inserted text */
+       

        gint len = GTK_EDITABLE(m_text)->current_pos;
        gint len = GTK_EDITABLE(m_text)->current_pos;

-       // Insert text at this point
+

         gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
         gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );

-       // Note: the insertion point is now at 'len' (past our insertion).
+       
+       /* bring editable's cursor uptodate. bug in GTK. */
+       
+       GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
+    

     }
     else
     {
     }
     else
     {


@@ -527,22 +537,35 @@ int wxTextCtrl::GetNumberOfLines() const
 
 void wxTextCtrl::SetInsertionPoint( long pos )
 {
 
 void wxTextCtrl::SetInsertionPoint( long pos )
 {

-    int len;

     wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
     wxCHECK_RET( m_text != NULL, "invalid text ctrl" );

-    if (m_windowStyle & wxTE_MULTILINE) {
-        //gtk_text_set_point( GTK_TEXT(m_text), (int)pos );
-        /* HH: The call commented out above doesn't do anything. Don't know
-        * why. The code below isn't perfect either; it doesn't move the
-        * actual cursor, but subsequent calls to WriteText will insert
-        * text at the set position and move the displayed cursor behind it as 
-        * well. I guess this is good enough for most uses. */
-        len = gtk_text_get_length( GTK_TEXT(m_text) );
-       if ( (pos < 0) || (pos > len) )
-         pos = len;
-       GTK_EDITABLE(m_text)->current_pos = (int)pos;
+    
+    if (m_windowStyle & wxTE_MULTILINE) 
+    {
+        /* seems to be broken in GTK 1.0.X:
+          gtk_text_set_point( GTK_TEXT(m_text), (int)pos ); */
+      
+        gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
+          GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+      
+        /* we fake a set_point by inserting and deleting. as the user
+          isn't supposed to get to know about thos non-sense, we
+          disconnect so that no events are sent to the user program. */
+      
+        gint tmp = (gint)pos;
+        gtk_editable_insert_text( GTK_EDITABLE(m_text), " ", 1, &tmp );
+       gtk_editable_delete_text( GTK_EDITABLE(m_text), tmp-1, tmp );
+       
+        gtk_signal_connect( GTK_OBJECT(m_text), "changed",
+          GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+         
+       /* bring editable's cursor uptodate. another bug in GTK. */
+       
+       GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );

     }
     else
     }
     else

+    {

         gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos );
         gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos );

+    }

 }
 
 void wxTextCtrl::SetInsertionPointEnd()
 }
 
 void wxTextCtrl::SetInsertionPointEnd()

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index b76cdfa686991863daf66a23bd3c149613525ff7..90bf2685d166583641f820a6b94e0cd802708273 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -347,7 +347,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
     }
 
     // win is a control: tab can be propagated up
     }
 
     // win is a control: tab can be propagated up

-    if ((!ret) && (gdk_event->keyval == GDK_Tab))
+    if ((!ret) && (gdk_event->keyval == GDK_Tab) && ((win->m_windowStyle & wxTE_PROCESS_TAB) == 0))

     {
         wxNavigationKeyEvent new_event;
         new_event.SetDirection( !(gdk_event->state & GDK_SHIFT_MASK) );
     {
         wxNavigationKeyEvent new_event;
         new_event.SetDirection( !(gdk_event->state & GDK_SHIFT_MASK) );