Expand the range of WXK_ values that are excluded from OnChar.

[wxWidgets.git] / src / common / popupcmn.cpp

diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index 0415aedfb5b7f2cf99ada429c6a86c3edfc1bb40..6571388a34a1db8a3d334f2ed0f12160ecdda2d1 100644 (file)
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -6,7 +6,7 @@
 // Created:     06.01.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     06.01.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// License:     wxWindows license
+// License:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "popupwinbase.h"
 #endif
 
     #pragma implementation "popupwinbase.h"
 #endif
 


@@ -28,7 +28,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_POPUPWIN && !defined(__WXMOTIF__)
+#if wxUSE_POPUPWIN

 
 #include "wx/popupwin.h"
 
 
 #include "wx/popupwin.h"
 


@@ -45,7 +45,7 @@
 
 // there is no src/mgl/popupwin.cpp to put this in, so we do it here - BTW we
 // probably could do it for all ports here just as well
 
 // there is no src/mgl/popupwin.cpp to put this in, so we do it here - BTW we
 // probably could do it for all ports here just as well

-#if defined(__WXMGL__) || defined(__WXPM__)
+#if defined(__WXMGL__)

     IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
 #endif // __WXMSW__
 
     IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
 #endif // __WXMSW__
 


@@ -74,6 +74,7 @@ private:
     wxPopupTransientWindow *m_popup;
 
     DECLARE_EVENT_TABLE()
     wxPopupTransientWindow *m_popup;
 
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxPopupWindowHandler)

 };
 
 class wxPopupFocusHandler : public wxEvtHandler
 };
 
 class wxPopupFocusHandler : public wxEvtHandler


@@ -104,6 +105,7 @@ private:
 #endif // __WXGTK__
 
     DECLARE_EVENT_TABLE()
 #endif // __WXGTK__
 
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxPopupFocusHandler)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------