From 81939780038ebf6681da3fdb40d64e84a3a331b1 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Thu, 9 Feb 2006 22:19:14 +0000 Subject: [PATCH] Fix link errors from advdll_taskbar.o on cygwin git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/menu.cpp | 6 +++--- src/gtk1/menu.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index 0178cad93d..28fa85d2fc 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -1411,13 +1411,13 @@ static wxString GetGtkHotKey( const wxMenuItem& item ) #if wxUSE_MENUS_NATIVE -extern "C" +extern "C" WXDLLIMPEXP_CORE void gtk_pop_hide_callback( GtkWidget *WXUNUSED(widget), bool* is_waiting ) { *is_waiting = FALSE; } -void SetInvokingWindow( wxMenu *menu, wxWindow* win ) +WXDLLIMPEXP_CORE void SetInvokingWindow( wxMenu *menu, wxWindow* win ) { menu->SetInvokingWindow( win ); @@ -1434,7 +1434,7 @@ void SetInvokingWindow( wxMenu *menu, wxWindow* win ) } } -extern "C" +extern "C" WXDLLIMPEXP_CORE void wxPopupMenuPositionCallback( GtkMenu *menu, gint *x, gint *y, gboolean * WXUNUSED(whatever), diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp index 9db5c31b27..7a92ab979d 100644 --- a/src/gtk1/menu.cpp +++ b/src/gtk1/menu.cpp @@ -1445,13 +1445,13 @@ static wxString GetGtkHotKey( const wxMenuItem& item ) #if wxUSE_MENUS_NATIVE -extern "C" +extern "C" WXDLLIMPEXP_CORE void gtk_pop_hide_callback( GtkWidget *WXUNUSED(widget), bool* is_waiting ) { *is_waiting = FALSE; } -void SetInvokingWindow( wxMenu *menu, wxWindow* win ) +WXDLLIMPEXP_CORE void SetInvokingWindow( wxMenu *menu, wxWindow* win ) { menu->SetInvokingWindow( win ); @@ -1468,7 +1468,7 @@ void SetInvokingWindow( wxMenu *menu, wxWindow* win ) } } -extern "C" +extern "C" WXDLLIMPEXP_CORE void wxPopupMenuPositionCallback( GtkMenu *menu, gint *x, gint *y, gpointer user_data ) -- 2.45.2