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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 0178cad93d5b72cf949268f50624fb599f510aa4..28fa85d2fced15c3f6673af3a9e8e55f45dbebbf 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -1411,13 +1411,13 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
 
 #if wxUSE_MENUS_NATIVE
 
 
 #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 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 );
 
 {
     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),
 void wxPopupMenuPositionCallback( GtkMenu *menu,
                                   gint *x, gint *y,
                                   gboolean * WXUNUSED(whatever),

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 9db5c31b275ec409e604f795896bf240d331b60b..7a92ab979d15e0041e34f3c8e179e045afbcf7b0 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -1445,13 +1445,13 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
 
 #if wxUSE_MENUS_NATIVE
 
 
 #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 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 );
 
 {
     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 )
 void wxPopupMenuPositionCallback( GtkMenu *menu,
                                   gint *x, gint *y,
                                   gpointer user_data )