From: Robert Roebling Date: Wed, 2 Feb 2000 17:59:12 +0000 (+0000) Subject: Tried to fix corrupted display of wxTextCtrl, X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/68df5777c7f72890dccef9dd9160397f2a834bb4 Tried to fix corrupted display of wxTextCtrl, Corrected wxFileDialog's multiple file option. Corrected event mask for CaptureMouse(), Small change to "best visual" code. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h index 714222ae0c..5faee033c6 100644 --- a/include/wx/gtk/textctrl.h +++ b/include/wx/gtk/textctrl.h @@ -112,6 +112,8 @@ public: virtual void SetSelection(long from, long to); virtual void SetEditable(bool editable); + virtual bool Enable( bool enable ); + // Implementation from now on void OnDropFiles( wxDropFilesEvent &event ); void OnChar( wxKeyEvent &event ); diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h index 714222ae0c..5faee033c6 100644 --- a/include/wx/gtk1/textctrl.h +++ b/include/wx/gtk1/textctrl.h @@ -112,6 +112,8 @@ public: virtual void SetSelection(long from, long to); virtual void SetEditable(bool editable); + virtual bool Enable( bool enable ); + // Implementation from now on void OnDropFiles( wxDropFilesEvent &event ); void OnChar( wxKeyEvent &event ); diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index 72612fdd1b..e8364dd3d4 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -1155,10 +1155,11 @@ void wxFileDialog::GetPaths( wxArrayString& paths ) const item.m_mask = wxLIST_MASK_TEXT; item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); - while ( item.m_itemId != -1 ) { + while ( item.m_itemId != -1 ) + { m_list->GetItem( item ); paths.Add( dir + item.m_text ); - item.m_itemId = m_list->GetNextItem( item.m_itemId + 1, + item.m_itemId = m_list->GetNextItem( item.m_itemId, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); } } @@ -1177,10 +1178,11 @@ void wxFileDialog::GetFilenames(wxArrayString& files) const item.m_mask = wxLIST_MASK_TEXT; item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); - while ( item.m_itemId != -1 ) { + while ( item.m_itemId != -1 ) + { m_list->GetItem( item ); files.Add( item.m_text ); - item.m_itemId = m_list->GetNextItem( item.m_itemId + 1, + item.m_itemId = m_list->GetNextItem( item.m_itemId, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); } } diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 9b13515ed4..fce981832b 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -285,9 +285,6 @@ bool wxApp::OnInitGui() visual = vis; } - wxRootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_widget_realize( wxRootWindow ); - /* Nothing to do for 15, 16, 24, 32 bit displays */ if (visual->depth > 8) return TRUE; @@ -635,6 +632,9 @@ int wxEntry( int argc, char *argv[] ) if ( !wxTheApp->OnInitGui() ) retValue = -1; + wxRootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); + gtk_widget_realize( wxRootWindow ); + // Here frames insert themselves automatically into wxTopLevelWindows by // getting created in OnInit(). if ( retValue == 0 ) diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index ddd7432d18..0f8df9de99 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -607,6 +607,26 @@ void wxTextCtrl::SetEditable( bool editable ) gtk_entry_set_editable( GTK_ENTRY(m_text), editable ); } +bool wxTextCtrl::Enable( bool enable ) +{ + if (!wxWindowBase::Enable(enable)) + { + // nothing to do + return FALSE; + } + + if (m_windowStyle & wxTE_MULTILINE) + { + gtk_text_set_editable( GTK_TEXT(m_text), enable ); + } + else + { + gtk_widget_set_sensitive( m_text, enable ); + } + + return TRUE; +} + void wxTextCtrl::DiscardEdits() { m_modified = FALSE; diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index b760a98993..c7c7373a79 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -3241,6 +3241,8 @@ void wxWindow::CaptureMouse() (GdkEventMask) (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | + GDK_KEY_PRESS_MASK | + GDK_KEY_RELEASE_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_POINTER_MOTION_MASK), (GdkWindow *) NULL, diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index 9b13515ed4..fce981832b 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -285,9 +285,6 @@ bool wxApp::OnInitGui() visual = vis; } - wxRootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_widget_realize( wxRootWindow ); - /* Nothing to do for 15, 16, 24, 32 bit displays */ if (visual->depth > 8) return TRUE; @@ -635,6 +632,9 @@ int wxEntry( int argc, char *argv[] ) if ( !wxTheApp->OnInitGui() ) retValue = -1; + wxRootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); + gtk_widget_realize( wxRootWindow ); + // Here frames insert themselves automatically into wxTopLevelWindows by // getting created in OnInit(). if ( retValue == 0 ) diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index ddd7432d18..0f8df9de99 100644 --- a/src/gtk1/textctrl.cpp +++ b/src/gtk1/textctrl.cpp @@ -607,6 +607,26 @@ void wxTextCtrl::SetEditable( bool editable ) gtk_entry_set_editable( GTK_ENTRY(m_text), editable ); } +bool wxTextCtrl::Enable( bool enable ) +{ + if (!wxWindowBase::Enable(enable)) + { + // nothing to do + return FALSE; + } + + if (m_windowStyle & wxTE_MULTILINE) + { + gtk_text_set_editable( GTK_TEXT(m_text), enable ); + } + else + { + gtk_widget_set_sensitive( m_text, enable ); + } + + return TRUE; +} + void wxTextCtrl::DiscardEdits() { m_modified = FALSE; diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index b760a98993..c7c7373a79 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -3241,6 +3241,8 @@ void wxWindow::CaptureMouse() (GdkEventMask) (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | + GDK_KEY_PRESS_MASK | + GDK_KEY_RELEASE_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_POINTER_MOTION_MASK), (GdkWindow *) NULL, diff --git a/utils/tex2rtf/src/makefile.unx b/utils/tex2rtf/src/makefile.unx index 082f482dfe..4a818458f9 100644 --- a/utils/tex2rtf/src/makefile.unx +++ b/utils/tex2rtf/src/makefile.unx @@ -1,17 +1,23 @@ -# -# File: makefile.unx -# Author: Julian Smart -# Created: 1998 -# Updated: -# Copyright: (c) 1998 Julian Smart -# -# "%W% %G%" -# -# Makefile for Tex2RTF (Unix) - -PROGRAM=tex2rtf +# makefile + +CC = g++ + +PROGRAM = tex2rtf OBJECTS = tex2rtf.o tex2any.o texutils.o rtfutils.o xlputils.o htmlutil.o readshg.o table.o -include ../../../src/makeprog.env +# implementation + +.SUFFIXES: .o .cpp + +.cpp.o : + $(CC) -c `wx-config --cflags` -o $@ $< + +all: $(PROGRAM) + +$(PROGRAM): $(OBJECTS) + $(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` + +clean: + rm -f *.o $(PROGRAM)