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

wxDialogs now use GTK_WINDOW_DIALOG,

Browse Source 
Corrected cursor setting bug with right aligned checkboxes,
  Disabled code in ~wxView that unset the m_currentView,
  One more thing I forgot.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-11-02 18:11:18 +00:00
parent 4ff9eba644
commit 173348db5f
7 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/docview.cpp
View File

@@ -528,7 +528,7 @@ wxView::wxView()
wxView::~wxView() wxView::~wxView()
{ {
GetDocumentManager()->ActivateView(this, FALSE, TRUE); // GetDocumentManager()->ActivateView(this, FALSE, TRUE);
m_viewDocument->RemoveView(this); m_viewDocument->RemoveView(this);
} }

4
src/gtk/checkbox.cpp
View File

@@ -197,14 +197,14 @@ void wxCheckBox::OnInternalIdle()
wxCursor cursor = m_cursor; wxCursor cursor = m_cursor;
if (g_globalCursor.Ok()) cursor = g_globalCursor; if (g_globalCursor.Ok()) cursor = g_globalCursor;
if (GTK_TOGGLE_BUTTON(m_widget)->event_window && cursor.Ok()) if (GTK_TOGGLE_BUTTON(m_widgetCheckbox)->event_window && cursor.Ok())
{ {
/* I now set the cursor the anew in every OnInternalIdle call /* I now set the cursor the anew in every OnInternalIdle call
as setting the cursor in a parent window also effects the as setting the cursor in a parent window also effects the
windows above so that checking for the current cursor is windows above so that checking for the current cursor is
not possible. */ not possible. */
gdk_window_set_cursor( GTK_TOGGLE_BUTTON(m_widget)->event_window, cursor.GetCursor() ); gdk_window_set_cursor( GTK_TOGGLE_BUTTON(m_widgetCheckbox)->event_window, cursor.GetCursor() );
} }
UpdateWindowUI(); UpdateWindowUI();

2
src/gtk/dialog.cpp
View File

@@ -259,7 +259,7 @@ bool wxDialog::Create( wxWindow *parent,
m_insertCallback = (wxInsertChildFunction) wxInsertChildInDialog; m_insertCallback = (wxInsertChildFunction) wxInsertChildInDialog;
m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL ); m_widget = gtk_window_new( GTK_WINDOW_DIALOG );
if (!name.IsEmpty()) if (!name.IsEmpty())
gtk_window_set_wmclass( GTK_WINDOW(m_widget), name.mb_str(), name.mb_str() ); gtk_window_set_wmclass( GTK_WINDOW(m_widget), name.mb_str(), name.mb_str() );

5
src/gtk/window.cpp
View File

@@ -2459,13 +2459,14 @@ void wxWindow::SetFocus()
if (m_wxwindow) if (m_wxwindow)
{ {
gtk_widget_grab_focus (m_wxwindow); if (!GTK_WIDGET_HAS_FOCUS (m_wxwindow))
gtk_widget_grab_focus (m_wxwindow);
return; return;
} }
if (m_widget) if (m_widget)
{ {
if (GTK_WIDGET_CAN_FOCUS(m_widget) /*&& !GTK_WIDGET_HAS_FOCUS (connect_widget)*/ ) if (GTK_WIDGET_CAN_FOCUS(m_widget) && !GTK_WIDGET_HAS_FOCUS (m_widget) )
{ {
gtk_widget_grab_focus (m_widget); gtk_widget_grab_focus (m_widget);
} }

4
src/gtk1/checkbox.cpp
View File

@@ -197,14 +197,14 @@ void wxCheckBox::OnInternalIdle()
wxCursor cursor = m_cursor; wxCursor cursor = m_cursor;
if (g_globalCursor.Ok()) cursor = g_globalCursor; if (g_globalCursor.Ok()) cursor = g_globalCursor;
if (GTK_TOGGLE_BUTTON(m_widget)->event_window && cursor.Ok()) if (GTK_TOGGLE_BUTTON(m_widgetCheckbox)->event_window && cursor.Ok())
{ {
/* I now set the cursor the anew in every OnInternalIdle call /* I now set the cursor the anew in every OnInternalIdle call
as setting the cursor in a parent window also effects the as setting the cursor in a parent window also effects the
windows above so that checking for the current cursor is windows above so that checking for the current cursor is
not possible. */ not possible. */
gdk_window_set_cursor( GTK_TOGGLE_BUTTON(m_widget)->event_window, cursor.GetCursor() ); gdk_window_set_cursor( GTK_TOGGLE_BUTTON(m_widgetCheckbox)->event_window, cursor.GetCursor() );
} }
UpdateWindowUI(); UpdateWindowUI();

2
src/gtk1/dialog.cpp
View File

@@ -259,7 +259,7 @@ bool wxDialog::Create( wxWindow *parent,
m_insertCallback = (wxInsertChildFunction) wxInsertChildInDialog; m_insertCallback = (wxInsertChildFunction) wxInsertChildInDialog;
m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL ); m_widget = gtk_window_new( GTK_WINDOW_DIALOG );
if (!name.IsEmpty()) if (!name.IsEmpty())
gtk_window_set_wmclass( GTK_WINDOW(m_widget), name.mb_str(), name.mb_str() ); gtk_window_set_wmclass( GTK_WINDOW(m_widget), name.mb_str(), name.mb_str() );

5
src/gtk1/window.cpp
View File

@@ -2459,13 +2459,14 @@ void wxWindow::SetFocus()
if (m_wxwindow) if (m_wxwindow)
{ {
gtk_widget_grab_focus (m_wxwindow); if (!GTK_WIDGET_HAS_FOCUS (m_wxwindow))
gtk_widget_grab_focus (m_wxwindow);
return; return;
} }
if (m_widget) if (m_widget)
{ {
if (GTK_WIDGET_CAN_FOCUS(m_widget) /*&& !GTK_WIDGET_HAS_FOCUS (connect_widget)*/ ) if (GTK_WIDGET_CAN_FOCUS(m_widget) && !GTK_WIDGET_HAS_FOCUS (m_widget) )
{ {
gtk_widget_grab_focus (m_widget); gtk_widget_grab_focus (m_widget);
} }