don't do anything in SetWindowMenu() if we're setting the same menu as we already...

[wxWidgets.git] / include / wx / x11 / app.h

diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h
index e6faab08e1c0c3a55e9803e64e383eb64539dbea..02bea53fffc4340a6ed0da5b0fb8f37393b55b9a 100644 (file)
--- a/include/wx/x11/app.h
+++ b/include/wx/x11/app.h
@@ -23,18 +23,18 @@
 // forward declarations
 // ----------------------------------------------------------------------------
 
 // forward declarations
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFrame;
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxApp;
-class WXDLLEXPORT wxKeyEvent;
-class WXDLLEXPORT wxLog;
-class WXDLLEXPORT wxXVisualInfo;
+class WXDLLIMPEXP_FWD_CORE wxFrame;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxApp;
+class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
+class WXDLLIMPEXP_FWD_BASE wxLog;
+class WXDLLIMPEXP_FWD_CORE wxXVisualInfo;

 
 // ----------------------------------------------------------------------------
 // the wxApp class for wxX11 - see wxAppBase for more details
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // the wxApp class for wxX11 - see wxAppBase for more details
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxApp : public wxAppBase
+class WXDLLIMPEXP_CORE wxApp : public wxAppBase

 {
 public:
     wxApp();
 {
 public:
     wxApp();


@@ -84,7 +84,7 @@ public:
     PangoContext* GetPangoContext();
 #endif
 
     PangoContext* GetPangoContext();
 #endif
 

-    wxXVisualInfo* GetVisualInfo(WXDisplay* display)
+    wxXVisualInfo* GetVisualInfo(WXDisplay* WXUNUSED(display))

     {
         // this should be implemented correctly for wxBitmap to work
         // with multiple display
     {
         // this should be implemented correctly for wxBitmap to work
         // with multiple display