update patches
This commit is contained in:
parent
cc2308f323
commit
9ba7df22b0
|
@ -1,46 +0,0 @@
|
||||||
Index: src/gtk/dnd.cpp
|
|
||||||
===================================================================
|
|
||||||
--- src/gtk/dnd.cpp (revision 65479)
|
|
||||||
+++ src/gtk/dnd.cpp (revision 65480)
|
|
||||||
@@ -946,21 +946,27 @@
|
|
||||||
|
|
||||||
void wxDropSource::UnregisterWindow()
|
|
||||||
{
|
|
||||||
- if (!m_widget)
|
|
||||||
- return;
|
|
||||||
+ if (m_widget)
|
|
||||||
+ {
|
|
||||||
+ g_signal_handlers_disconnect_by_func (m_widget,
|
|
||||||
+ (gpointer) source_drag_data_get,
|
|
||||||
+ this);
|
|
||||||
+ g_signal_handlers_disconnect_by_func (m_widget,
|
|
||||||
+ (gpointer) source_drag_data_delete,
|
|
||||||
+ this);
|
|
||||||
+ g_signal_handlers_disconnect_by_func (m_widget,
|
|
||||||
+ (gpointer) source_drag_begin,
|
|
||||||
+ this);
|
|
||||||
+ g_signal_handlers_disconnect_by_func (m_widget,
|
|
||||||
+ (gpointer) source_drag_end,
|
|
||||||
+ this);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- g_signal_handlers_disconnect_by_func (m_widget,
|
|
||||||
- (gpointer) source_drag_data_get,
|
|
||||||
- this);
|
|
||||||
- g_signal_handlers_disconnect_by_func (m_widget,
|
|
||||||
- (gpointer) source_drag_data_delete,
|
|
||||||
- this);
|
|
||||||
- g_signal_handlers_disconnect_by_func (m_widget,
|
|
||||||
- (gpointer) source_drag_begin,
|
|
||||||
- this);
|
|
||||||
- g_signal_handlers_disconnect_by_func (m_widget,
|
|
||||||
- (gpointer) source_drag_end,
|
|
||||||
- this);
|
|
||||||
+ if (m_iconWindow)
|
|
||||||
+ {
|
|
||||||
+ g_signal_handlers_disconnect_by_func (m_iconWindow,
|
|
||||||
+ (gpointer) gtk_dnd_window_configure_callback, this);
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
--- wxGTK-2.8.12.orig/tests/test.cpp 2011-03-22 13:18:05.000000000 +0100
|
||||||
|
+++ wxGTK-2.8.12/tests/test.cpp 2011-04-14 10:35:44.000000000 +0200
|
||||||
|
@@ -86,11 +86,11 @@ void TestApp::OnInitCmdLine(wxCmdLinePar
|
||||||
|
{ wxCMD_LINE_SWITCH, _T("L"), _T("longlist"),
|
||||||
|
_T("list the test cases, do not run them"),
|
||||||
|
wxCMD_LINE_VAL_NONE, 0 },
|
||||||
|
- { wxCMD_LINE_SWITCH, "d", "detail",
|
||||||
|
- "print the test case names, run them (not implemented)",
|
||||||
|
+ { wxCMD_LINE_SWITCH, _T("d"), _T("detail"),
|
||||||
|
+ _T("print the test case names, run them (not implemented)"),
|
||||||
|
wxCMD_LINE_VAL_NONE, 0 },
|
||||||
|
- { wxCMD_LINE_SWITCH, "t", "timing",
|
||||||
|
- "print names and mesure running time of individual test, run them (not implemented)",
|
||||||
|
+ { wxCMD_LINE_SWITCH, _T("t"), _T("timing"),
|
||||||
|
+ _T("print names and mesure running time of individual test, run them (not implemented)"),
|
||||||
|
wxCMD_LINE_VAL_NONE, 0 },
|
||||||
|
{ wxCMD_LINE_PARAM, 0, 0, _T("REGISTRY"), wxCMD_LINE_VAL_STRING,
|
||||||
|
wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE },
|
Loading…
Reference in New Issue