need to overload assertEquals(int,short) too to resolve ambiguity

[wxWidgets.git] / include / wx / palmos / popupwin.h

diff --git a/include/wx/palmos/popupwin.h b/include/wx/palmos/popupwin.h
index beaced311e72d4ec45e809c8a02d54509a1f5b5b..ec04565614d0b1a75615da5c167c973978a8895c 100644 (file)
--- a/include/wx/palmos/popupwin.h
+++ b/include/wx/palmos/popupwin.h
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/popupwin.h
-// Purpose:     wxPopupWindow class for wxMSW
-// Author:      William Osborne
+// Purpose:     wxPopupWindow class for PalmOS
+// Author:      William Osborne - minimal working wxPalmOS port
 // Modified by:
 // Created:     10/13/04
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -12,15 +12,11 @@
 #ifndef _WX_MSW_POPUPWIN_H_
 #define _WX_MSW_POPUPWIN_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "popup.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // wxPopupWindow
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase
+class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase
 {
 public:
     wxPopupWindow() { }
@@ -30,7 +26,7 @@ public:
 
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 
-    virtual bool Show(bool show = TRUE);
+    virtual bool Show(bool show = true);
 
 protected:
     // popups handle the position like wxTopLevelWindow, not wxWindow