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

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,
source->DeviceToLogicalX(xsrc),
source->DeviceToLogicalY(ysrc),
source->LogicalToDeviceX(xsrc),
source->LogicalToDeviceY(ysrc),
xx,
yy,
source->DeviceToLogicalXRel(width),
source->DeviceToLogicalYRel(height) );
source->LogicalToDeviceXRel(width),
source->LogicalToDeviceYRel(height) );
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,
source->DeviceToLogicalX(xsrc),
source->DeviceToLogicalY(ysrc),
source->LogicalToDeviceX(xsrc),
source->LogicalToDeviceY(ysrc),
xx,
yy,
source->DeviceToLogicalXRel(width),
source->DeviceToLogicalYRel(height) );
source->LogicalToDeviceXRel(width),
source->LogicalToDeviceYRel(height) );
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(),
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;

35
src/gtk1/filedlg.cpp
View File

@@ -19,9 +19,29 @@
#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;
@@ -43,6 +63,11 @@ void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data )
dialog->OnOK( event );
}
//-----------------------------------------------------------------------------
// "clicked" for Cancel-button
//-----------------------------------------------------------------------------
static
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 );
}
//-----------------------------------------------------------------------------
// wxFileDialog
//-----------------------------------------------------------------------------
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(m_widget), "delete_event",
GTK_SIGNAL_FUNC(gtk_filedialog_delete_callback), (gpointer)this );
}
int wxFileDialog::ShowModal(void)

5
src/gtk1/listbox.cpp
View File

@@ -17,7 +17,10 @@
#include "wx/utils.h"
#include "wx/intl.h"
#include "wx/checklst.h"
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
#endif
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
@@ -347,7 +350,9 @@ void wxListBox::AppendCommon( const wxString &item )
#endif
#endif
#if wxUSE_TOOLTIPS
if (m_toolTip) m_toolTip->Apply( this );
#endif
}
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_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 );
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)
@@ -286,12 +292,16 @@ void wxTextCtrl::WriteText( const wxString &text )
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;
// Insert text at this point
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
{
@@ -527,22 +537,35 @@ int wxTextCtrl::GetNumberOfLines() const
void wxTextCtrl::SetInsertionPoint( long pos )
{
int len;
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
{
gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos );
}
}
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
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) );