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

Added wxAddGrab, wxRemoveGrab for use by popup window implementations

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-01-03 16:37:32 +00:00
parent 71b4a9b878
commit 224016a800
4 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/gtk/private.h
View File

@@ -131,6 +131,10 @@ inline wxEventType GtkScrollWinTypeToWx(guint scrollType)
wxEVT_SCROLLWIN_TOP - wxEVT_SCROLL_TOP; wxEVT_SCROLLWIN_TOP - wxEVT_SCROLL_TOP;
} }
// Needed for implementing e.g. combobox on wxGTK within a modal dialog.
void wxAddGrab(wxWindow* window);
void wxRemoveGrab(wxWindow* window);
#ifdef __WXGTK20__ #ifdef __WXGTK20__
// Escapes string so that it is valid Pango markup XML string: // Escapes string so that it is valid Pango markup XML string:
WXDLLIMPEXP_CORE wxString wxEscapeStringForPangoMarkup(const wxString& str); WXDLLIMPEXP_CORE wxString wxEscapeStringForPangoMarkup(const wxString& str);

4
include/wx/gtk1/private.h
View File

@@ -131,6 +131,10 @@ inline wxEventType GtkScrollWinTypeToWx(guint scrollType)
wxEVT_SCROLLWIN_TOP - wxEVT_SCROLL_TOP; wxEVT_SCROLLWIN_TOP - wxEVT_SCROLL_TOP;
} }
// Needed for implementing e.g. combobox on wxGTK within a modal dialog.
void wxAddGrab(wxWindow* window);
void wxRemoveGrab(wxWindow* window);
#ifdef __WXGTK20__ #ifdef __WXGTK20__
// Escapes string so that it is valid Pango markup XML string: // Escapes string so that it is valid Pango markup XML string:
WXDLLIMPEXP_CORE wxString wxEscapeStringForPangoMarkup(const wxString& str); WXDLLIMPEXP_CORE wxString wxEscapeStringForPangoMarkup(const wxString& str);

14
src/gtk/window.cpp
View File

@@ -4738,8 +4738,19 @@ wxPoint wxGetMousePosition()
} }
// Needed for implementing e.g. combobox on wxGTK within a modal dialog.
void wxAddGrab(wxWindow* window)
{
gtk_grab_add( (GtkWidget*) window->GetHandle() );
}
void wxRemoveGrab(wxWindow* window)
{
gtk_grab_remove( (GtkWidget*) window->GetHandle() );
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxDCModule // wxWinModule
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class wxWinModule : public wxModule class wxWinModule : public wxModule
@@ -4768,4 +4779,3 @@ void wxWinModule::OnExit()
gdk_gc_unref( g_eraseGC ); gdk_gc_unref( g_eraseGC );
} }
// vi:sts=4:sw=4:et

14
src/gtk1/window.cpp
View File

@@ -4738,8 +4738,19 @@ wxPoint wxGetMousePosition()
} }
// Needed for implementing e.g. combobox on wxGTK within a modal dialog.
void wxAddGrab(wxWindow* window)
{
gtk_grab_add( (GtkWidget*) window->GetHandle() );
}
void wxRemoveGrab(wxWindow* window)
{
gtk_grab_remove( (GtkWidget*) window->GetHandle() );
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxDCModule // wxWinModule
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class wxWinModule : public wxModule class wxWinModule : public wxModule
@@ -4768,4 +4779,3 @@ void wxWinModule::OnExit()
gdk_gc_unref( g_eraseGC ); gdk_gc_unref( g_eraseGC );
} }
// vi:sts=4:sw=4:et