Use text/uri-list instead of x-moz-url in wxGTK wxURLDataObject.

[wxWidgets.git] / samples / oleauto / oleauto.cpp

diff --git a/samples/oleauto/oleauto.cpp b/samples/oleauto/oleauto.cpp
index bf3b5ca1cfd60834b94db44d2bcba89b2015fab9..1bd9e97b6b8552d3e300045b5c3faff7e19bd998 100644 (file)
--- a/samples/oleauto/oleauto.cpp
+++ b/samples/oleauto/oleauto.cpp
@@ -32,7 +32,7 @@
 
 #include "wx/msw/ole/automtn.h"
 
 
 #include "wx/msw/ole/automtn.h"
 

-#ifndef __WXMSW__
+#ifndef __WINDOWS__

 #error "Sorry, this sample works under Windows only."
 #endif
 
 #error "Sorry, this sample works under Windows only."
 #endif
 


@@ -40,7 +40,7 @@
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 


@@ -156,7 +156,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     wxMenu *menuFile = new wxMenu;
 
     menuFile->Append(OleAuto_Test, wxT("&Test Excel Automation..."));
     wxMenu *menuFile = new wxMenu;
 
     menuFile->Append(OleAuto_Test, wxT("&Test Excel Automation..."));

-    menuFile->Append(OleAuto_About, wxT("&About..."));
+    menuFile->Append(OleAuto_About, wxT("&About"));

     menuFile->AppendSeparator();
     menuFile->Append(OleAuto_Quit, wxT("E&xit"));
 
     menuFile->AppendSeparator();
     menuFile->Append(OleAuto_Quit, wxT("E&xit"));