wxMSW: return correct value from wxMessageDialog::GetReturnCode().

[wxWidgets.git] / include / wx / tooltip.h

diff --git a/include/wx/tooltip.h b/include/wx/tooltip.h
index f7ff630068611050ce37e65c9f28b665a37889c0..0948e65eff232cc389d6eb43886f077e3f3ecc22 100644 (file)
--- a/include/wx/tooltip.h
+++ b/include/wx/tooltip.h
@@ -1,11 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        tooltip.h
+// Name:        wx/tooltip.h

 // Purpose:     wxToolTip base header
 // Author:      Robert Roebling
 // Modified by:
 // Created:
 // Copyright:   (c) Robert Roebling
 // Purpose:     wxToolTip base header
 // Author:      Robert Roebling
 // Modified by:
 // Created:
 // Copyright:   (c) Robert Roebling

-// RCS-ID:      $Id$

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -20,10 +19,12 @@
 #include "wx/msw/tooltip.h"
 #elif defined(__WXMOTIF__)
 // #include "wx/motif/tooltip.h"
 #include "wx/msw/tooltip.h"
 #elif defined(__WXMOTIF__)
 // #include "wx/motif/tooltip.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

 #include "wx/gtk/tooltip.h"
 #include "wx/gtk/tooltip.h"

+#elif defined(__WXGTK__)
+#include "wx/gtk1/tooltip.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-#include "wx/mac/tooltip.h"
+#include "wx/osx/tooltip.h"

 #elif defined(__WXCOCOA__)
 #include "wx/cocoa/tooltip.h"
 #elif defined(__WXPM__)
 #elif defined(__WXCOCOA__)
 #include "wx/cocoa/tooltip.h"
 #elif defined(__WXPM__)