Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed some trash from that came through tha cables

Browse Source 
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
This commit is contained in:
Robert Roebling
1999-02-01 15:39:46 +00:00
parent a62489828e
commit 291a8f20b3
11 changed files with 197 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
samples/controls/controls.cpp
View File

@@ -387,19 +387,13 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
#endif #endif
wxButton *button = (wxButton*)NULL; wxButton *button = (wxButton*) NULL; /* who did this ? */
// m_notebook->SetBackgroundColour("cadet blue");
wxPanel *panel = (wxPanel*) NULL; wxPanel *panel = (wxPanel*) NULL;
panel = new wxPanel(m_notebook); 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 = new wxListBox( panel, ID_LISTBOX, wxPoint(10,10), wxSize(120,70), 5, choices );
m_listbox->SetToolTip( "This is a list box" ); 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_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_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_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 = new wxButton( panel, ID_LISTBOX_FONT, "Set Italic font", wxPoint(340,130), wxSize(140,30) );
button->SetToolTip( "Press here to set italic font" ); 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 = new wxCheckBox( panel, ID_LISTBOX_ENABLE, "Disable", wxPoint(20,130), wxSize(140,30) );
m_checkbox->SetValue(FALSE); m_checkbox->SetValue(FALSE);
m_checkbox->SetToolTip( "Click here to disable the listbox" ); m_checkbox->SetToolTip( "Click here to disable the listbox" );
m_notebook->AddPage(panel, "wxList", TRUE, Image_List); m_notebook->AddPage(panel, "wxList", TRUE, Image_List);
panel = new wxPanel(m_notebook); 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_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_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_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); m_notebook->AddPage(panel, "wxChoice", FALSE, Image_Choice);
panel = new wxPanel(m_notebook); 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_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_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_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); m_notebook->AddPage(panel, "wxComboBox", FALSE, Image_Combo);
panel = new wxPanel(m_notebook); panel = new wxPanel(m_notebook);
// panel->SetBackgroundColour("cadet blue"); m_textentry = new MyTextCtrl( panel, -1, "Write text here.", wxPoint(10,10), wxSize(320,28),
// panel->SetForegroundColour("blue");
m_textentry = new MyTextCtrl( panel, -1, "Write text here.",
wxPoint(10,10), wxSize(320,28),
wxTE_PROCESS_ENTER); wxTE_PROCESS_ENTER);
(*m_textentry) << " More text."; (*m_textentry) << " More text.";
// m_textentry->SetBackgroundColour("wheat"); m_multitext = new MyTextCtrl( panel, ID_TEXT, "And here.", wxPoint(10,50), wxSize(320,70),
m_multitext = new MyTextCtrl( panel, ID_TEXT, "And here.",
wxPoint(10,50), wxSize(320,80),
wxTE_MULTILINE ); wxTE_MULTILINE );
(*m_multitext) << " More text." (*m_multitext) << " More text.\nPress function keys to test different \nwxTextCtrl functions.";
<< "\nPress Fn keys to test different wxTextCtrl functions"; new MyTextCtrl( panel, -1, "This one is with wxTE_PROCESS_TAB style.",
// m_multitext->SetBackgroundColour("wheat"); wxPoint(10,120), wxSize(320,70), wxTE_MULTILINE | wxTE_PROCESS_TAB);
(void)new MyTextCtrl( panel, -1, "This one is with wxTE_PROCESS_TAB style.",
wxPoint(10,140), wxSize(320,80), wxTE_MULTILINE | wxTE_PROCESS_TAB);
(void)new wxStaticBox( panel, -1, "&Move cursor to the end of:", (void)new wxStaticBox( panel, -1, "&Move cursor to the end of:",
wxPoint(345, 0), wxSize(160, 100) ); 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)); wxPoint(370, 20), wxSize(110, 30));
(void)new wxButton(panel, ID_MOVE_END_ZONE, "Text &zone", (void)new wxButton(panel, ID_MOVE_END_ZONE, "Text &zone",
wxPoint(370, 60), wxSize(110, 30)); wxPoint(370, 60), wxSize(110, 30));
(void)new wxStaticBox( panel, -1, "wx&Clipboard", wxPoint(345,120), wxSize(160,100) ); (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(370,140), wxSize(110,30) ); (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(370,180), 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); m_notebook->AddPage(panel, "wxTextCtrl" , FALSE, Image_Text);
wxString choices2[] = 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 = new wxRadioBox( panel, ID_RADIOBOX, "This", wxPoint(10,10), wxSize(-1,-1), 5, choices, 1, wxRA_SPECIFY_COLS );
// m_radio->SetBackgroundColour("wheat");
(void)new wxButton( panel, ID_RADIOBOX_SEL_NUM, "Select #2", wxPoint(180,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) ); (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 = 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 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) ); (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) ); 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); m_notebook->AddPage(panel, "wxRadioBox", FALSE, Image_Radio);
panel = new wxPanel(m_notebook); 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) ); (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 = 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) ); (void)new wxStaticBox( panel, -1, "Explanation", wxPoint(200,10), wxSize(290,130) );
#ifdef __WXMOTIF__ #ifdef __WXMOTIF__
// No wrapping text in wxStaticText yet :-( // 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" "This is also supposed to demonstrate how\n"
"to use static controls.\n", "to use static controls.\n",
wxPoint(208,25), wxPoint(208,25),
wxSize(210, 110) wxSize(250, 110)
); );
#endif #endif
m_spintext = new wxTextCtrl( panel, -1, "0", wxPoint(20,160), wxSize(80,-1) ); 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: case ID_LISTBOX_ENABLE:
{ {
m_text->WriteText("Checkbox clicked.\n"); m_text->WriteText("Checkbox clicked.\n");
#ifdef __WXGTK__
wxCheckBox *cb = (wxCheckBox*)event.GetEventObject(); wxCheckBox *cb = (wxCheckBox*)event.GetEventObject();
if (event.GetInt()) if (event.GetInt())
cb->SetToolTip( "Click to enable listbox" ); cb->SetToolTip( "Click to enable listbox" );
else else
cb->SetToolTip( "Click to disable listbox" ); cb->SetToolTip( "Click to disable listbox" );
#endif
m_listbox->Enable( event.GetInt() == 0 ); m_listbox->Enable( event.GetInt() == 0 );
break; break;
} }

24
src/gtk/dcclient.cpp
View File

@@ -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->LogicalToDeviceX(xsrc),
source->DeviceToLogicalY(ysrc), source->LogicalToDeviceY(ysrc),
xx, xx,
yy, yy,
source->DeviceToLogicalXRel(width), source->LogicalToDeviceXRel(width),
source->DeviceToLogicalYRel(height) ); 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->LogicalToDeviceX(xsrc),
source->DeviceToLogicalY(ysrc), source->LogicalToDeviceY(ysrc),
xx, xx,
yy, yy,
source->DeviceToLogicalXRel(width), source->LogicalToDeviceXRel(width),
source->DeviceToLogicalYRel(height) ); 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, gdk_window_copy_area ( m_window, m_penGC,
XLOG2DEV(xdest), YLOG2DEV(ydest), XLOG2DEV(xdest), YLOG2DEV(ydest),
csrc->GetWindow(), csrc->GetWindow(),
source->DeviceToLogicalX(xsrc), source->LogicalToDeviceX(xsrc),
source->DeviceToLogicalY(ysrc), source->LogicalToDeviceY(ysrc),
source->DeviceToLogicalXRel(width), source->LogicalToDeviceXRel(width),
source->DeviceToLogicalYRel(height) ); source->LogicalToDeviceYRel(height) );
SetLogicalFunction( old_logical_func ); SetLogicalFunction( old_logical_func );
return TRUE; return TRUE;

35
src/gtk/filedlg.cpp
View File

@@ -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 ) void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data )
{ {
wxFileDialog *dialog = (wxFileDialog*)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 ) void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(widget), gpointer data )
{ {
wxFileDialog *dialog = (wxFileDialog*)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) IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxDialog)
wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message, 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_connect( GTK_OBJECT(sel->cancel_button), "clicked",
GTK_SIGNAL_FUNC(gtk_filedialog_cancel_callback), (gpointer*)this ); 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)

5
src/gtk/listbox.cpp
View File

@@ -17,7 +17,10 @@
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/checklst.h" #include "wx/checklst.h"
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h" #include "wx/tooltip.h"
#endif
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h" #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 )

59
src/gtk/textctrl.cpp
View File

@@ -182,11 +182,17 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
gtk_signal_connect( GTK_OBJECT(m_text), "changed", gtk_signal_connect( GTK_OBJECT(m_text), "changed",
GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
if (!value.IsNull()) if (!value.IsEmpty())
{ {
gint tmp = 0; gint tmp = 0;
gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp ); 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) ); /* this moves the cursor pos to behind the inserted text */
// Find the current insertion point
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 ); if (m_windowStyle & wxTE_MULTILINE)
/* 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 /* seems to be broken in GTK 1.0.X:
* actual cursor, but subsequent calls to WriteText will insert gtk_text_set_point( GTK_TEXT(m_text), (int)pos ); */
* text at the set position and move the displayed cursor behind it as
* well. I guess this is good enough for most uses. */ gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
len = gtk_text_get_length( GTK_TEXT(m_text) ); GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
if ( (pos < 0) || (pos > len) )
pos = len; /* we fake a set_point by inserting and deleting. as the user
GTK_EDITABLE(m_text)->current_pos = (int)pos; 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()

2
src/gtk/window.cpp
View File

@@ -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; wxNavigationKeyEvent new_event;
new_event.SetDirection( !(gdk_event->state & GDK_SHIFT_MASK) ); new_event.SetDirection( !(gdk_event->state & GDK_SHIFT_MASK) );

24
src/gtk1/dcclient.cpp
View File

@@ -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->LogicalToDeviceX(xsrc),
source->DeviceToLogicalY(ysrc), source->LogicalToDeviceY(ysrc),
xx, xx,
yy, yy,
source->DeviceToLogicalXRel(width), source->LogicalToDeviceXRel(width),
source->DeviceToLogicalYRel(height) ); 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->LogicalToDeviceX(xsrc),
source->DeviceToLogicalY(ysrc), source->LogicalToDeviceY(ysrc),
xx, xx,
yy, yy,
source->DeviceToLogicalXRel(width), source->LogicalToDeviceXRel(width),
source->DeviceToLogicalYRel(height) ); 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, gdk_window_copy_area ( m_window, m_penGC,
XLOG2DEV(xdest), YLOG2DEV(ydest), XLOG2DEV(xdest), YLOG2DEV(ydest),
csrc->GetWindow(), csrc->GetWindow(),
source->DeviceToLogicalX(xsrc), source->LogicalToDeviceX(xsrc),
source->DeviceToLogicalY(ysrc), source->LogicalToDeviceY(ysrc),
source->DeviceToLogicalXRel(width), source->LogicalToDeviceXRel(width),
source->DeviceToLogicalYRel(height) ); source->LogicalToDeviceYRel(height) );
SetLogicalFunction( old_logical_func ); SetLogicalFunction( old_logical_func );
return TRUE; return TRUE;

35
src/gtk1/filedlg.cpp
View File

@@ -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 ) void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data )
{ {
wxFileDialog *dialog = (wxFileDialog*)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 ) void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(widget), gpointer data )
{ {
wxFileDialog *dialog = (wxFileDialog*)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) IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxDialog)
wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message, 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_connect( GTK_OBJECT(sel->cancel_button), "clicked",
GTK_SIGNAL_FUNC(gtk_filedialog_cancel_callback), (gpointer*)this ); 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)

5
src/gtk1/listbox.cpp
View File

@@ -17,7 +17,10 @@
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/checklst.h" #include "wx/checklst.h"
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h" #include "wx/tooltip.h"
#endif
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h" #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 )

59
src/gtk1/textctrl.cpp
View File

@@ -182,11 +182,17 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
gtk_signal_connect( GTK_OBJECT(m_text), "changed", gtk_signal_connect( GTK_OBJECT(m_text), "changed",
GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
if (!value.IsNull()) if (!value.IsEmpty())
{ {
gint tmp = 0; gint tmp = 0;
gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp ); 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) ); /* this moves the cursor pos to behind the inserted text */
// Find the current insertion point
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 ); if (m_windowStyle & wxTE_MULTILINE)
/* 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 /* seems to be broken in GTK 1.0.X:
* actual cursor, but subsequent calls to WriteText will insert gtk_text_set_point( GTK_TEXT(m_text), (int)pos ); */
* text at the set position and move the displayed cursor behind it as
* well. I guess this is good enough for most uses. */ gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
len = gtk_text_get_length( GTK_TEXT(m_text) ); GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
if ( (pos < 0) || (pos > len) )
pos = len; /* we fake a set_point by inserting and deleting. as the user
GTK_EDITABLE(m_text)->current_pos = (int)pos; 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()

2
src/gtk1/window.cpp
View File

@@ -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; wxNavigationKeyEvent new_event;
new_event.SetDirection( !(gdk_event->state & GDK_SHIFT_MASK) ); new_event.SetDirection( !(gdk_event->state & GDK_SHIFT_MASK) );