added NZST and NZDT time zones (request 617912)

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

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index e971b49a00c134684f46d55375c843312c76d03d..c8adb53e31d73986ea644d5f3f754e979ed44b9e 100644 (file)
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -12,10 +12,6 @@
 #ifndef _WX_POPUPWIN_H_BASE_
 #define _WX_POPUPWIN_H_BASE_
 
 #ifndef _WX_POPUPWIN_H_BASE_
 #define _WX_POPUPWIN_H_BASE_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "popupwinbase.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_POPUPWIN
 #include "wx/defs.h"
 
 #if wxUSE_POPUPWIN


@@ -60,8 +56,10 @@ public:
     #include "wx/msw/popupwin.h"
 #elif defined(__WXPM__)
     #include "wx/os2/popupwin.h"
     #include "wx/msw/popupwin.h"
 #elif defined(__WXPM__)
     #include "wx/os2/popupwin.h"

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

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

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

 #elif defined(__WXX11__)
     #include "wx/x11/popupwin.h"
 #elif defined(__WXMOTIF__)
 #elif defined(__WXX11__)
     #include "wx/x11/popupwin.h"
 #elif defined(__WXMOTIF__)


@@ -158,15 +156,15 @@ protected:
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxComboBox;
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxComboBox;

-class WXDLLEXPORT wxComboControl;
+class WXDLLEXPORT wxComboCtrl;

 
 class WXDLLEXPORT wxPopupComboWindow : public wxPopupTransientWindow
 {
 public:
     wxPopupComboWindow() { m_combo = NULL; }
 
 class WXDLLEXPORT wxPopupComboWindow : public wxPopupTransientWindow
 {
 public:
     wxPopupComboWindow() { m_combo = NULL; }

-    wxPopupComboWindow(wxComboControl *parent);
+    wxPopupComboWindow(wxComboCtrl *parent);

 
 

-    bool Create(wxComboControl *parent);
+    bool Create(wxComboCtrl *parent);

 
     // position the window correctly relatively to the combo
     void PositionNearCombo();
 
     // position the window correctly relatively to the combo
     void PositionNearCombo();


@@ -179,7 +177,7 @@ protected:
     void OnKeyDown(wxKeyEvent& event);
 
     // the parent combobox
     void OnKeyDown(wxKeyEvent& event);
 
     // the parent combobox

-    wxComboControl *m_combo;
+    wxComboCtrl *m_combo;

 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxPopupComboWindow)
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxPopupComboWindow)