Add some version checks to help compiling on OSX.

[wxWidgets.git] / src / common / combocmn.cpp
diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp

index ad80f48d51b54081bcdfd9f7b18a79c671357642..ff3563c2dbdb916f6feeb007c230b17a04416740 100644 (file)
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -23,16 +23,20 @@
      #pragma hdrstop
  #endif
  
      #pragma hdrstop
  #endif
  
-#if wxUSE_COMBOCTRL
-
+#if wxUSE_COMBOBOX
  #include "wx/combobox.h"
  #include "wx/combobox.h"
+extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[] = "comboBox";
+#endif
+
+#if wxUSE_COMBOCTRL
  
  #ifndef WX_PRECOMP
  
  #ifndef WX_PRECOMP
+    #include "wx/app.h"
      #include "wx/log.h"
      #include "wx/dcclient.h"
      #include "wx/settings.h"
      #include "wx/log.h"
      #include "wx/dcclient.h"
      #include "wx/settings.h"
-    #include "wx/dialog.h"
      #include "wx/timer.h"
      #include "wx/timer.h"
+    #include "wx/textctrl.h"
  #endif
  
  #include "wx/tooltip.h"
  #endif
  
  #include "wx/tooltip.h"
@@ -40,14 +44,75 @@
  #include "wx/combo.h"
  
  
  #include "wx/combo.h"
  
  
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+wxDEFINE_FLAGS( wxComboBoxStyle )
+wxBEGIN_FLAGS( wxComboBoxStyle )
+// new style border flags, we put them first to
+// use them for streaming out
+wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+wxFLAGS_MEMBER(wxBORDER_RAISED)
+wxFLAGS_MEMBER(wxBORDER_STATIC)
+wxFLAGS_MEMBER(wxBORDER_NONE)
+
+// old style border flags
+wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+wxFLAGS_MEMBER(wxRAISED_BORDER)
+wxFLAGS_MEMBER(wxSTATIC_BORDER)
+wxFLAGS_MEMBER(wxBORDER)
+
+// standard window styles
+wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+wxFLAGS_MEMBER(wxWANTS_CHARS)
+wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+wxFLAGS_MEMBER(wxVSCROLL)
+wxFLAGS_MEMBER(wxHSCROLL)
+
+wxFLAGS_MEMBER(wxCB_SIMPLE)
+wxFLAGS_MEMBER(wxCB_SORT)
+wxFLAGS_MEMBER(wxCB_READONLY)
+wxFLAGS_MEMBER(wxCB_DROPDOWN)
+
+wxEND_FLAGS( wxComboBoxStyle )
+
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxControl, "wx/combobox.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxComboBox)
+wxEVENT_PROPERTY( Select, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEvent )
+wxEVENT_PROPERTY( TextEnter, wxEVT_COMMAND_TEXT_ENTER, wxCommandEvent )
+
+// TODO DELEGATES
+wxPROPERTY( Font, wxFont, SetFont, GetFont, wxEMPTY_PARAMETER_VALUE, \
+           0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxPROPERTY_COLLECTION( Choices, wxArrayString, wxString, AppendString, \
+                      GetStrings, 0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxPROPERTY( Value,wxString, SetValue, GetValue, wxEMPTY_PARAMETER_VALUE, \
+           0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxPROPERTY( Selection,int, SetSelection, GetSelection, wxEMPTY_PARAMETER_VALUE, \
+           0 /*flags*/, wxT("Helpstring"), wxT("group"))
+
+wxPROPERTY_FLAGS( WindowStyle, wxComboBoxStyle, long, SetWindowStyleFlag, \
+                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
+                 wxT("Helpstring"), wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxComboBox)
+
+wxCONSTRUCTOR_5( wxComboBox, wxWindow*, Parent, wxWindowID, Id, \
+                wxString, Value, wxPoint, Position, wxSize, Size )
  
  // constants
  // ----------------------------------------------------------------------------
  
  
  // constants
  // ----------------------------------------------------------------------------
  
-// Milliseconds to wait for two mouse-ups after focus inorder
-// to trigger a double-click.
-#define DOUBLE_CLICK_CONVERSION_TRESHOLD        500
-
  #define DEFAULT_DROPBUTTON_WIDTH                19
  
  #define BMP_BUTTON_MARGIN                       4
  #define DEFAULT_DROPBUTTON_WIDTH                19
  
  #define BMP_BUTTON_MARGIN                       4
@@ -61,26 +126,80 @@
  
  #if defined(__WXMSW__)
  
  
  #if defined(__WXMSW__)
  
+// Let's use wxFrame as a fall-back solution until wxMSW gets wxNonOwnedWindow
+#include "wx/frame.h"
+#define wxCC_GENERIC_TLW_IS_FRAME
+#define wxComboCtrlGenericTLW   wxFrame
+
  #define USE_TRANSIENT_POPUP           1 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
  #define USE_TRANSIENT_POPUP           1 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
+#define TRANSIENT_POPUPWIN_IS_PERFECT 0 // wxPopupTransientWindow works, its child can have focus, and common
+                                        // native controls work on it like normal.
+#define POPUPWIN_IS_PERFECT           0 // Same, but for non-transient popup window.
  #define TEXTCTRL_TEXT_CENTERED        0 // 1 if text in textctrl is vertically centered
  #define TEXTCTRL_TEXT_CENTERED        0 // 1 if text in textctrl is vertically centered
+#define FOCUS_RING                    0 // No focus ring on wxMSW
  
  //#undef wxUSE_POPUPWIN
  //#define wxUSE_POPUPWIN 0
  
  #elif defined(__WXGTK__)
  
  
  //#undef wxUSE_POPUPWIN
  //#define wxUSE_POPUPWIN 0
  
  #elif defined(__WXGTK__)
  
+// NB: It is not recommended to use wxDialog as popup on wxGTK, because of
+//     this bug: If wxDialog is hidden, its position becomes corrupt
+//     between hide and next show, but without internal coordinates being
+//     reflected (or something like that - atleast commenting out ->Hide()
+//     seemed to eliminate the position change).
+
+#include "wx/dialog.h"
+#define wxCC_GENERIC_TLW_IS_DIALOG
+#define wxComboCtrlGenericTLW   wxDialog
+
+#if defined(__WXGTK20__)
+# include "wx/gtk/private.h"
+#else
+# include "wx/gtk1/private.h"
+#endif
+
+// NB: Let's not be afraid to use wxGTK's wxPopupTransientWindow as a
+//     'perfect' popup, as it can successfully host child controls even in
+//     popups that are shown in modal dialogs.
+
  #define USE_TRANSIENT_POPUP           1 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
  #define USE_TRANSIENT_POPUP           1 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
+#define TRANSIENT_POPUPWIN_IS_PERFECT 1 // wxPopupTransientWindow works, its child can have focus, and common
+                                        // native controls work on it like normal.
+#define POPUPWIN_IS_PERFECT           1 // Same, but for non-transient popup window.
  #define TEXTCTRL_TEXT_CENTERED        1 // 1 if text in textctrl is vertically centered
  #define TEXTCTRL_TEXT_CENTERED        1 // 1 if text in textctrl is vertically centered
+#define FOCUS_RING                    0 // No focus ring on wxGTK
  
  #elif defined(__WXMAC__)
  
  
  #elif defined(__WXMAC__)
  
-#define USE_TRANSIENT_POPUP           0 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
+#include "wx/nonownedwnd.h"
+#define wxCC_GENERIC_TLW_IS_NONOWNEDWINDOW
+#define wxComboCtrlGenericTLW   wxNonOwnedWindow
+
+#define USE_TRANSIENT_POPUP           1 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
+#define TRANSIENT_POPUPWIN_IS_PERFECT 1 // wxPopupTransientWindow works, its child can have focus, and common
+                                        // native controls work on it like normal.
+#define POPUPWIN_IS_PERFECT           1 // Same, but for non-transient popup window.
  #define TEXTCTRL_TEXT_CENTERED        1 // 1 if text in textctrl is vertically centered
  #define TEXTCTRL_TEXT_CENTERED        1 // 1 if text in textctrl is vertically centered
+#define FOCUS_RING                    3 // Reserve room for the textctrl's focus ring to display
+
+#undef DEFAULT_DROPBUTTON_WIDTH
+#define DEFAULT_DROPBUTTON_WIDTH      22
+#undef COMBO_MARGIN
+#define COMBO_MARGIN                  FOCUS_RING
  
  #else
  
  
  #else
  
+#include "wx/dialog.h"
+#define wxCC_GENERIC_TLW_IS_DIALOG
+#define wxComboCtrlGenericTLW   wxDialog
+
  #define USE_TRANSIENT_POPUP           0 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
  #define USE_TRANSIENT_POPUP           0 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
+#define TRANSIENT_POPUPWIN_IS_PERFECT 0 // wxPopupTransientWindow works, its child can have focus, and common
+                                        // native controls work on it like normal.
+#define POPUPWIN_IS_PERFECT           0 // Same, but for non-transient popup window.
  #define TEXTCTRL_TEXT_CENTERED        1 // 1 if text in textctrl is vertically centered
  #define TEXTCTRL_TEXT_CENTERED        1 // 1 if text in textctrl is vertically centered
+#define FOCUS_RING                    0
  
  #endif
  
  
  #endif
  
@@ -88,7 +207,7 @@
  // Popupwin is really only supported on wxMSW (not WINCE) and wxGTK, regardless
  // what the wxUSE_POPUPWIN says.
  // FIXME: Why isn't wxUSE_POPUPWIN reliable any longer? (it was in wxW2.6.2)
  // Popupwin is really only supported on wxMSW (not WINCE) and wxGTK, regardless
  // what the wxUSE_POPUPWIN says.
  // FIXME: Why isn't wxUSE_POPUPWIN reliable any longer? (it was in wxW2.6.2)
-#if (!defined(__WXMSW__) && !defined(__WXGTK__)) || defined(__WXWINCE__)
+#if (!defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMAC__)) || defined(__WXWINCE__)
  #undef wxUSE_POPUPWIN
  #define wxUSE_POPUPWIN 0
  #endif
  #undef wxUSE_POPUPWIN
  #define wxUSE_POPUPWIN 0
  #endif
@@ -102,24 +221,97 @@
  #endif
  
  
  #endif
  
  
-#if USE_TRANSIENT_POPUP
+// Define different types of popup windows
+enum
+{
+    POPUPWIN_NONE                   = 0,
+    POPUPWIN_WXPOPUPTRANSIENTWINDOW = 1,
+    POPUPWIN_WXPOPUPWINDOW          = 2,
+    POPUPWIN_GENERICTLW             = 3
+};
  
  
-    #define wxComboPopupWindowBase wxPopupTransientWindow
-    #define INSTALL_TOPLEV_HANDLER       0
+
+#if USE_TRANSIENT_POPUP
+    // wxPopupTransientWindow is implemented
+
+    #define wxComboPopupWindowBase  wxPopupTransientWindow
+    #define PRIMARY_POPUP_TYPE      POPUPWIN_WXPOPUPTRANSIENTWINDOW
+    #define USES_WXPOPUPTRANSIENTWINDOW 1
+
+    #if TRANSIENT_POPUPWIN_IS_PERFECT
+        //
+    #elif POPUPWIN_IS_PERFECT
+        #define wxComboPopupWindowBase2     wxPopupWindow
+        #define SECONDARY_POPUP_TYPE        POPUPWIN_WXPOPUPWINDOW
+        #define USES_WXPOPUPWINDOW          1
+    #else
+        #define wxComboPopupWindowBase2     wxComboCtrlGenericTLW
+        #define SECONDARY_POPUP_TYPE        POPUPWIN_GENERICTLW
+        #define USES_GENERICTLW             1
+    #endif
  
  #elif wxUSE_POPUPWIN
  
  #elif wxUSE_POPUPWIN
+    // wxPopupWindow (but not wxPopupTransientWindow) is properly implemented
+
+    #define wxComboPopupWindowBase      wxPopupWindow
+    #define PRIMARY_POPUP_TYPE          POPUPWIN_WXPOPUPWINDOW
+    #define USES_WXPOPUPWINDOW          1
  
  
-    #define wxComboPopupWindowBase wxPopupWindow
-    #define INSTALL_TOPLEV_HANDLER       1
+    #if !POPUPWIN_IS_PERFECT
+        #define wxComboPopupWindowBase2     wxComboCtrlGenericTLW
+        #define SECONDARY_POPUP_TYPE        POPUPWIN_GENERICTLW
+        #define USES_GENERICTLW             1
+    #endif
  
  #else
  
  #else
+    // wxPopupWindow is not implemented
+
+    #define wxComboPopupWindowBase      wxComboCtrlGenericTLW
+    #define PRIMARY_POPUP_TYPE          POPUPWIN_GENERICTLW
+    #define USES_GENERICTLW             1
+
+#endif
  
  
-    #define wxComboPopupWindowBase wxDialog
-    #define INSTALL_TOPLEV_HANDLER      0 // Doesn't need since can monitor active event
  
  
+#ifndef USES_WXPOPUPTRANSIENTWINDOW
+    #define USES_WXPOPUPTRANSIENTWINDOW 0
+#endif
+
+#ifndef USES_WXPOPUPWINDOW
+    #define USES_WXPOPUPWINDOW          0
+#endif
+
+#ifndef USES_GENERICTLW
+    #define USES_GENERICTLW             0
+#endif
+
+
+#if USES_WXPOPUPWINDOW
+    #define INSTALL_TOPLEV_HANDLER      1
+#else
+    #define INSTALL_TOPLEV_HANDLER      0
  #endif
  
  
  #endif
  
  
+// Returns true if given popup window type can be classified as perfect
+// on this platform.
+static inline bool IsPopupWinTypePerfect( wxByte popupWinType )
+{
+#if POPUPWIN_IS_PERFECT && TRANSIENT_POPUPWIN_IS_PERFECT
+    wxUnusedVar(popupWinType);
+    return true;
+#else
+    return ( popupWinType == POPUPWIN_GENERICTLW
+        #if POPUPWIN_IS_PERFECT
+             || popupWinType == POPUPWIN_WXPOPUPWINDOW
+        #endif
+        #if TRANSIENT_POPUPWIN_IS_PERFECT
+             || popupWinType == POPUPWIN_WXPOPUPTRANSIENTWINDOW
+        #endif
+            );
+#endif
+}
+
  
  //
  // ** TODO **
  
  //
  // ** TODO **
@@ -207,7 +399,7 @@ void wxComboFrameEventHandler::OnIdle( wxIdleEvent& event )
           winFocused != m_combo->GetButton() // GTK (atleast) requires this
          )
      {
           winFocused != m_combo->GetButton() // GTK (atleast) requires this
          )
      {
-        m_combo->HidePopup();
+        m_combo->HidePopup(true);
      }
  
      event.Skip();
      }
  
      event.Skip();
@@ -215,44 +407,44 @@ void wxComboFrameEventHandler::OnIdle( wxIdleEvent& event )
  
  void wxComboFrameEventHandler::OnMenuEvent( wxMenuEvent& event )
  {
  
  void wxComboFrameEventHandler::OnMenuEvent( wxMenuEvent& event )
  {
-    m_combo->HidePopup();
+    m_combo->HidePopup(true);
      event.Skip();
  }
  
  void wxComboFrameEventHandler::OnMouseEvent( wxMouseEvent& event )
  {
      event.Skip();
  }
  
  void wxComboFrameEventHandler::OnMouseEvent( wxMouseEvent& event )
  {
-    m_combo->HidePopup();
+    m_combo->HidePopup(true);
      event.Skip();
  }
  
  void wxComboFrameEventHandler::OnClose( wxCloseEvent& event )
  {
      event.Skip();
  }
  
  void wxComboFrameEventHandler::OnClose( wxCloseEvent& event )
  {
-    m_combo->HidePopup();
+    m_combo->HidePopup(true);
      event.Skip();
  }
  
  void wxComboFrameEventHandler::OnActivate( wxActivateEvent& event )
  {
      event.Skip();
  }
  
  void wxComboFrameEventHandler::OnActivate( wxActivateEvent& event )
  {
-    m_combo->HidePopup();
+    m_combo->HidePopup(true);
      event.Skip();
  }
  
  void wxComboFrameEventHandler::OnResize( wxSizeEvent& event )
  {
      event.Skip();
  }
  
  void wxComboFrameEventHandler::OnResize( wxSizeEvent& event )
  {
-    m_combo->HidePopup();
+    m_combo->HidePopup(true);
      event.Skip();
  }
  
  void wxComboFrameEventHandler::OnMove( wxMoveEvent& event )
  {
      event.Skip();
  }
  
  void wxComboFrameEventHandler::OnMove( wxMoveEvent& event )
  {
-    m_combo->HidePopup();
+    m_combo->HidePopup(true);
      event.Skip();
  }
  
  #endif // INSTALL_TOPLEV_HANDLER
  
  // ----------------------------------------------------------------------------
      event.Skip();
  }
  
  #endif // INSTALL_TOPLEV_HANDLER
  
  // ----------------------------------------------------------------------------
-// wxComboPopupWindow is wxPopupWindow customized for
+// wxComboPopupWindow is, in essence, wxPopupWindow customized for
  // wxComboCtrl.
  // ----------------------------------------------------------------------------
  
  // wxComboCtrl.
  // ----------------------------------------------------------------------------
  
@@ -260,105 +452,146 @@ class wxComboPopupWindow : public wxComboPopupWindowBase
  {
  public:
  
  {
  public:
  
-    wxComboPopupWindow( wxComboCtrlBase *parent, int style = wxBORDER_NONE );
+    wxComboPopupWindow( wxComboCtrlBase *parent,
+                        int style )
+    #if USES_WXPOPUPWINDOW || USES_WXPOPUPTRANSIENTWINDOW
+                       : wxComboPopupWindowBase(parent,style)
+    #else
+                       : wxComboPopupWindowBase(parent,
+                                                wxID_ANY,
+                                                wxEmptyString,
+                                                wxPoint(-21,-21),
+                                                wxSize(20,20),
+                                                style)
+    #endif
+    {
+        m_inShow = 0;
+    }
  
  
-#if USE_TRANSIENT_POPUP
+#if USES_WXPOPUPTRANSIENTWINDOW
+    virtual bool Show( bool show );
      virtual bool ProcessLeftDown(wxMouseEvent& event);
      virtual bool ProcessLeftDown(wxMouseEvent& event);
+protected:
+    virtual void OnDismiss();
  #endif
  
  #endif
  
-    void OnKeyEvent(wxKeyEvent& event);
+private:
+    wxByte      m_inShow;
+};
  
  
-    void OnMouseEvent( wxMouseEvent& event );
-#if !wxUSE_POPUPWIN
-    void OnActivate( wxActivateEvent& event );
-#endif
  
  
-protected:
+#if USES_WXPOPUPTRANSIENTWINDOW
+bool wxComboPopupWindow::Show( bool show )
+{
+    // Guard against recursion
+    if ( m_inShow )
+        return wxComboPopupWindowBase::Show(show);
  
  
-#if USE_TRANSIENT_POPUP
-    virtual void OnDismiss();
+    m_inShow++;
+
+    wxASSERT( IsKindOf(CLASSINFO(wxPopupTransientWindow)) );
+
+    wxPopupTransientWindow* ptw = (wxPopupTransientWindow*) this;
+
+    if ( show != ptw->IsShown() )
+    {
+        if ( show )
+            // We used to do wxPopupTransientWindow::Popup here,
+            // but this would hide normal Show, which we are
+            // also going to need.
+            ptw->Show();
+        else
+            ptw->Dismiss();
+    }
+
+    m_inShow--;
+
+    return true;
+}
+
+bool wxComboPopupWindow::ProcessLeftDown(wxMouseEvent& event)
+{
+    return wxPopupTransientWindow::ProcessLeftDown(event);
+}
+
+// First thing that happens when a transient popup closes is that this method gets called.
+void wxComboPopupWindow::OnDismiss()
+{
+    wxComboCtrlBase* combo = (wxComboCtrlBase*) GetParent();
+    wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxComboCtrlBase)),
+                  wxT("parent might not be wxComboCtrl, but check IMPLEMENT_DYNAMIC_CLASS(2) macro for correctness") );
+
+    combo->OnPopupDismiss(true);
+}
+#endif // USES_WXPOPUPTRANSIENTWINDOW
+
+
+// ----------------------------------------------------------------------------
+// wxComboPopupWindowEvtHandler does bulk of the custom event handling
+// of a popup window. It is separate so we can have different types
+// of popup windows.
+// ----------------------------------------------------------------------------
+
+class wxComboPopupWindowEvtHandler : public wxEvtHandler
+{
+public:
+
+    wxComboPopupWindowEvtHandler( wxComboCtrlBase *parent )
+    {
+        m_combo = parent;
+    }
+
+    void OnSizeEvent( wxSizeEvent& event );
+    void OnKeyEvent(wxKeyEvent& event);
+#if USES_GENERICTLW
+    void OnActivate( wxActivateEvent& event );
  #endif
  
  private:
  #endif
  
  private:
+    wxComboCtrlBase*    m_combo;
+
      DECLARE_EVENT_TABLE()
  };
  
  
      DECLARE_EVENT_TABLE()
  };
  
  
-BEGIN_EVENT_TABLE(wxComboPopupWindow, wxComboPopupWindowBase)
-    EVT_MOUSE_EVENTS(wxComboPopupWindow::OnMouseEvent)
-#if !wxUSE_POPUPWIN
-    EVT_ACTIVATE(wxComboPopupWindow::OnActivate)
+BEGIN_EVENT_TABLE(wxComboPopupWindowEvtHandler, wxEvtHandler)
+    EVT_KEY_DOWN(wxComboPopupWindowEvtHandler::OnKeyEvent)
+    EVT_KEY_UP(wxComboPopupWindowEvtHandler::OnKeyEvent)
+    EVT_CHAR(wxComboPopupWindowEvtHandler::OnKeyEvent)
+#if USES_GENERICTLW
+    EVT_ACTIVATE(wxComboPopupWindowEvtHandler::OnActivate)
  #endif
  #endif
-    EVT_KEY_DOWN(wxComboPopupWindow::OnKeyEvent)
-    EVT_KEY_UP(wxComboPopupWindow::OnKeyEvent)
+    EVT_SIZE(wxComboPopupWindowEvtHandler::OnSizeEvent)
  END_EVENT_TABLE()
  
  
  END_EVENT_TABLE()
  
  
-wxComboPopupWindow::wxComboPopupWindow( wxComboCtrlBase *parent,
-                                        int style )
-#if wxUSE_POPUPWIN
-                                       : wxComboPopupWindowBase(parent,style)
-#else
-                                       : wxComboPopupWindowBase(parent,
-                                                                wxID_ANY,
-                                                                wxEmptyString,
-                                                                wxPoint(-21,-21),
-                                                                wxSize(20,20),
-                                                                style)
-#endif
+void wxComboPopupWindowEvtHandler::OnSizeEvent( wxSizeEvent& WXUNUSED(event) )
  {
  {
+    // Block the event so that the popup control does not get auto-resized.
  }
  
  }
  
-void wxComboPopupWindow::OnKeyEvent( wxKeyEvent& event )
+void wxComboPopupWindowEvtHandler::OnKeyEvent( wxKeyEvent& event )
  {
      // Relay keyboard event to the main child controls
  {
      // Relay keyboard event to the main child controls
-    // (just skipping may just cause the popup to close)
-    wxWindowList children = GetChildren();
+    wxWindowList children = m_combo->GetPopupWindow()->GetChildren();
      wxWindowList::iterator node = children.begin();
      wxWindow* child = (wxWindow*)*node;
      wxWindowList::iterator node = children.begin();
      wxWindow* child = (wxWindow*)*node;
-    child->AddPendingEvent(event);
-}
-
-void wxComboPopupWindow::OnMouseEvent( wxMouseEvent& event )
-{
-    event.Skip();
+    child->GetEventHandler()->ProcessEvent(event);
  }
  
  }
  
-#if !wxUSE_POPUPWIN
-void wxComboPopupWindow::OnActivate( wxActivateEvent& event )
+#if USES_GENERICTLW
+void wxComboPopupWindowEvtHandler::OnActivate( wxActivateEvent& event )
  {
      if ( !event.GetActive() )
      {
          // Tell combo control that we are dismissed.
  {
      if ( !event.GetActive() )
      {
          // Tell combo control that we are dismissed.
-        wxComboCtrl* combo = (wxComboCtrl*) GetParent();
-        wxASSERT( combo );
-        wxASSERT( combo->IsKindOf(CLASSINFO(wxComboCtrl)) );
-
-        combo->HidePopup();
+        m_combo->HidePopup(true);
  
          event.Skip();
      }
  }
  #endif
  
  
          event.Skip();
      }
  }
  #endif
  
-#if USE_TRANSIENT_POPUP
-bool wxComboPopupWindow::ProcessLeftDown(wxMouseEvent& event )
-{
-    return wxComboPopupWindowBase::ProcessLeftDown(event);
-}
-#endif
-
-#if USE_TRANSIENT_POPUP
-// First thing that happens when a transient popup closes is that this method gets called.
-void wxComboPopupWindow::OnDismiss()
-{
-    wxComboCtrlBase* combo = (wxComboCtrlBase*) GetParent();
-    wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxComboCtrlBase)),
-                  wxT("parent might not be wxComboCtrl, but check IMPLEMENT_DYNAMIC_CLASS(2) macro for correctness") );
-
-    combo->OnPopupDismiss();
-}
-#endif
  
  // ----------------------------------------------------------------------------
  // wxComboPopup
  
  // ----------------------------------------------------------------------------
  // wxComboPopup
@@ -377,6 +610,11 @@ void wxComboPopup::OnDismiss()
  {
  }
  
  {
  }
  
+wxComboCtrl* wxComboPopup::GetComboCtrl() const
+{
+    return wxStaticCast(m_combo, wxComboCtrl);
+}
+
  wxSize wxComboPopup::GetAdjustedSize( int minWidth,
                                        int prefHeight,
                                        int WXUNUSED(maxHeight) )
  wxSize wxComboPopup::GetAdjustedSize( int minWidth,
                                        int prefHeight,
                                        int WXUNUSED(maxHeight) )
@@ -392,7 +630,7 @@ void wxComboPopup::DefaultPaintComboControl( wxComboCtrlBase* combo,
          combo->PrepareBackground(dc,rect,0);
  
          dc.DrawText( combo->GetValue(),
          combo->PrepareBackground(dc,rect,0);
  
          dc.DrawText( combo->GetValue(),
-                     rect.x + combo->GetTextIndent(),
+                     rect.x + combo->m_marginLeft,
                       (rect.height-dc.GetCharHeight())/2 + rect.y );
      }
  }
                       (rect.height-dc.GetCharHeight())/2 + rect.y );
      }
  }
@@ -407,6 +645,11 @@ void wxComboPopup::OnComboKeyEvent( wxKeyEvent& event )
      event.Skip();
  }
  
      event.Skip();
  }
  
+void wxComboPopup::OnComboCharEvent( wxKeyEvent& event )
+{
+    event.Skip();
+}
+
  void wxComboPopup::OnComboDoubleClick()
  {
  }
  void wxComboPopup::OnComboDoubleClick()
  {
  }
@@ -415,6 +658,12 @@ void wxComboPopup::SetStringValue( const wxString& WXUNUSED(value) )
  {
  }
  
  {
  }
  
+bool wxComboPopup::FindItem(const wxString& WXUNUSED(item),
+                            wxString* WXUNUSED(trueItem))
+{
+    return true;
+}
+
  bool wxComboPopup::LazyCreate()
  {
      return false;
  bool wxComboPopup::LazyCreate()
  {
      return false;
@@ -422,7 +671,35 @@ bool wxComboPopup::LazyCreate()
  
  void wxComboPopup::Dismiss()
  {
  
  void wxComboPopup::Dismiss()
  {
-    m_combo->HidePopup();
+    m_combo->HidePopup(true);
+}
+
+void wxComboPopup::DestroyPopup()
+{
+    // Here we make sure that the popup control's Destroy() gets called.
+    // This is necessary for the wxPersistentWindow to work properly.
+    wxWindow* popupCtrl = GetControl();
+    if ( popupCtrl )
+    {
+        // While all wxComboCtrl examples have m_popupInterface and
+        // popupCtrl as the same class (that will be deleted via the
+        // Destroy() call below), it is technically still possible to
+        // have implementations where they are in fact not same
+        // multiple-inherited class. Here we use C++ RTTI to check for
+        // this rare case.
+      #ifndef wxNO_RTTI
+        // It is probably better to delete m_popupInterface first, so
+        // that it retains access to its popup control window.
+        if ( dynamic_cast<void*>(this) !=
+             dynamic_cast<void*>(popupCtrl) )
+            delete this;
+      #endif
+        popupCtrl->Destroy();
+    }
+    else
+    {
+        delete this;
+    }
  }
  
  // ----------------------------------------------------------------------------
  }
  
  // ----------------------------------------------------------------------------
@@ -455,7 +732,10 @@ private:
  
  BEGIN_EVENT_TABLE(wxComboBoxExtraInputHandler, wxEvtHandler)
      EVT_KEY_DOWN(wxComboBoxExtraInputHandler::OnKey)
  
  BEGIN_EVENT_TABLE(wxComboBoxExtraInputHandler, wxEvtHandler)
      EVT_KEY_DOWN(wxComboBoxExtraInputHandler::OnKey)
+    EVT_KEY_UP(wxComboBoxExtraInputHandler::OnKey)
+    EVT_CHAR(wxComboBoxExtraInputHandler::OnKey)
      EVT_SET_FOCUS(wxComboBoxExtraInputHandler::OnFocus)
      EVT_SET_FOCUS(wxComboBoxExtraInputHandler::OnFocus)
+    EVT_KILL_FOCUS(wxComboBoxExtraInputHandler::OnFocus)
  END_EVENT_TABLE()
  
  
  END_EVENT_TABLE()
  
  
@@ -463,21 +743,25 @@ void wxComboBoxExtraInputHandler::OnKey(wxKeyEvent& event)
  {
      // Let the wxComboCtrl event handler have a go first.
      wxComboCtrlBase* combo = m_combo;
  {
      // Let the wxComboCtrl event handler have a go first.
      wxComboCtrlBase* combo = m_combo;
-    wxObject* prevObj = event.GetEventObject();
  
  
-    event.SetId(combo->GetId());
-    event.SetEventObject(combo);
-    combo->GetEventHandler()->ProcessEvent(event);
+    wxKeyEvent redirectedEvent(event);
+    redirectedEvent.SetId(combo->GetId());
+    redirectedEvent.SetEventObject(combo);
  
  
-    event.SetId(((wxWindow*)prevObj)->GetId());
-    event.SetEventObject(prevObj);
+    if ( !combo->GetEventHandler()->ProcessEvent(redirectedEvent) )
+    {
+        // Don't let TAB through to the text ctrl - looks ugly
+        if ( event.GetKeyCode() != WXK_TAB )
+            event.Skip();
+    }
  }
  
  void wxComboBoxExtraInputHandler::OnFocus(wxFocusEvent& event)
  {
      // FIXME: This code does run when control is clicked,
      //        yet on Windows it doesn't select all the text.
  }
  
  void wxComboBoxExtraInputHandler::OnFocus(wxFocusEvent& event)
  {
      // FIXME: This code does run when control is clicked,
      //        yet on Windows it doesn't select all the text.
-    if ( !(m_combo->GetInternalFlags() & wxCC_NO_TEXT_AUTO_SELECT) )
+    if ( event.GetEventType() == wxEVT_SET_FOCUS &&
+        !(m_combo->GetInternalFlags() & wxCC_NO_TEXT_AUTO_SELECT) )
      {
          if ( m_combo->GetTextCtrl() )
              m_combo->GetTextCtrl()->SelectAll();
      {
          if ( m_combo->GetTextCtrl() )
              m_combo->GetTextCtrl()->SelectAll();
@@ -491,7 +775,8 @@ void wxComboBoxExtraInputHandler::OnFocus(wxFocusEvent& event)
      //     wxEVT_SET_FOCUSes (since m_text->SetFocus is called
      //     from combo's focus event handler), they should be quite
      //     harmless.
      //     wxEVT_SET_FOCUSes (since m_text->SetFocus is called
      //     from combo's focus event handler), they should be quite
      //     harmless.
-    wxFocusEvent evt2(wxEVT_SET_FOCUS,m_combo->GetId());
+    wxFocusEvent evt2(event);
+    evt2.SetId(m_combo->GetId());
      evt2.SetEventObject(m_combo);
      m_combo->GetEventHandler()->ProcessEvent(evt2);
  
      evt2.SetEventObject(m_combo);
      m_combo->GetEventHandler()->ProcessEvent(evt2);
  
@@ -503,17 +788,21 @@ void wxComboBoxExtraInputHandler::OnFocus(wxFocusEvent& event)
  // This is pushed to the event handler queue of the control in popup.
  //
  
  // This is pushed to the event handler queue of the control in popup.
  //
  
-class wxComboPopupExtraEventHandler : public wxEvtHandler
+class wxComboPopupEvtHandler : public wxEvtHandler
  {
  public:
  
  {
  public:
  
-    wxComboPopupExtraEventHandler( wxComboCtrlBase* combo )
+    wxComboPopupEvtHandler( wxComboCtrlBase* combo )
          : wxEvtHandler()
      {
          m_combo = combo;
          m_beenInside = false;
          : wxEvtHandler()
      {
          m_combo = combo;
          m_beenInside = false;
+
+        // Let's make it so that the popup control will not receive mouse
+        // events until mouse left button has been up.
+        m_blockEventsToPopup = true;
      }
      }
-    virtual ~wxComboPopupExtraEventHandler() { }
+    virtual ~wxComboPopupEvtHandler() { }
  
      void OnMouseEvent( wxMouseEvent& event );
  
  
      void OnMouseEvent( wxMouseEvent& event );
  
@@ -521,92 +810,163 @@ public:
      void OnPopupDismiss()
      {
          m_beenInside = false;
      void OnPopupDismiss()
      {
          m_beenInside = false;
+        m_blockEventsToPopup = true;
      }
  
  protected:
      wxComboCtrlBase*     m_combo;
  
      }
  
  protected:
      wxComboCtrlBase*     m_combo;
  
-    bool                    m_beenInside;
+    bool                m_beenInside;
+    bool                m_blockEventsToPopup;
  
  private:
      DECLARE_EVENT_TABLE()
  };
  
  
  
  private:
      DECLARE_EVENT_TABLE()
  };
  
  
-BEGIN_EVENT_TABLE(wxComboPopupExtraEventHandler, wxEvtHandler)
-    EVT_MOUSE_EVENTS(wxComboPopupExtraEventHandler::OnMouseEvent)
+BEGIN_EVENT_TABLE(wxComboPopupEvtHandler, wxEvtHandler)
+    EVT_MOUSE_EVENTS(wxComboPopupEvtHandler::OnMouseEvent)
  END_EVENT_TABLE()
  
  
  END_EVENT_TABLE()
  
  
-void wxComboPopupExtraEventHandler::OnMouseEvent( wxMouseEvent& event )
+void wxComboPopupEvtHandler::OnMouseEvent( wxMouseEvent& event )
  {
      wxPoint pt = event.GetPosition();
      wxSize sz = m_combo->GetPopupControl()->GetControl()->GetClientSize();
      int evtType = event.GetEventType();
      bool isInside = pt.x >= 0 && pt.y >= 0 && pt.x < sz.x && pt.y < sz.y;
  {
      wxPoint pt = event.GetPosition();
      wxSize sz = m_combo->GetPopupControl()->GetControl()->GetClientSize();
      int evtType = event.GetEventType();
      bool isInside = pt.x >= 0 && pt.y >= 0 && pt.x < sz.x && pt.y < sz.y;
+    bool relayToButton = false;
+
+    event.Skip();
  
  
-    if ( evtType == wxEVT_MOTION ||
-         evtType == wxEVT_LEFT_DOWN ||
-         evtType == wxEVT_RIGHT_DOWN )
+    if ( !isInside || !m_combo->IsPopupShown() )
      {
      {
-        // Block motion and click events outside the popup
-        if ( !isInside )
+        // Mouse is outside the popup or popup is not actually shown (yet)
+
+        if ( evtType == wxEVT_MOTION ||
+             evtType == wxEVT_LEFT_DOWN ||
+             evtType == wxEVT_LEFT_UP ||
+             evtType == wxEVT_RIGHT_DOWN )
          {
          {
+            // Block motion and click events outside the popup
              event.Skip(false);
              event.Skip(false);
-            return;
          }
      }
          }
      }
-    else if ( evtType == wxEVT_LEFT_UP )
+    else
      {
      {
-        // Don't let left-down events in if outside
-        if ( evtType == wxEVT_LEFT_DOWN )
-        {
-            if ( !isInside )
-                return;
-        }
+        // Mouse is inside the popup, which is fully shown
+
+        m_beenInside = true;
  
  
-        if ( !m_beenInside )
+        // Do not let the popup control respond to mouse events until
+        // mouse press used to display the popup has been lifted. This
+        // is important for users with slower mouse fingers or mouse
+        // drivers. Note that we have some redundancy here, just in
+        // case the popup is some native control that does not emit all
+        // mouse event types.
+        if ( evtType == wxEVT_MOTION )
          {
          {
-            if ( isInside )
+            if ( m_blockEventsToPopup )
              {
              {
-                m_beenInside = true;
+                if ( event.LeftIsDown() )
+                    event.Skip(false);
+                else
+                    m_blockEventsToPopup = false;
              }
              }
-            else
+        }
+        else if ( evtType == wxEVT_LEFT_DOWN )
+        {
+            if ( m_blockEventsToPopup )
+                m_blockEventsToPopup = false;
+        }
+        else if ( evtType == wxEVT_LEFT_UP )
+        {
+            if ( m_blockEventsToPopup )
              {
              {
-                //
-                // Some mouse events to popup that happen outside it, before cursor
-                // has been inside the popu, need to be ignored by it but relayed to
-                // the dropbutton.
-                //
-                wxWindow* btn = m_combo->GetButton();
-                if ( btn )
-                    btn->GetEventHandler()->AddPendingEvent(event);
-                else
-                    m_combo->GetEventHandler()->AddPendingEvent(event);
-
-                return;
+                // On first left up, stop blocking mouse events (but still
+                // block this one)
+                m_blockEventsToPopup = false;
+                event.Skip(false);
+
+                // Also, this button press was (probably) used to display
+                // the popup, so relay it back to the drop-down button
+                // (which supposedly originated it). This is necessary to
+                // refresh it properly.
+                relayToButton = true;
              }
              }
+        }
+        else if ( m_blockEventsToPopup )
+        {
+            event.Skip(false);
+        }
+    }
  
  
-            event.Skip();
+    //
+    // Some mouse events to popup that happen outside it, before cursor
+    // has been inside the popup, need to be ignored by it but relayed to
+    // the dropbutton.
+    //
+    if ( evtType == wxEVT_LEFT_UP )
+    {
+        if ( !m_combo->IsPopupShown() )
+        {
+            event.Skip(false);
+            relayToButton = true;
+        }
+        else if ( !isInside && !m_beenInside )
+        {
+            // Popup is shown but the cursor is not inside, nor it has been
+            relayToButton = true;
          }
      }
  
          }
      }
  
-    event.Skip();
+    if ( relayToButton )
+    {
+        wxWindow* btn = m_combo->GetButton();
+        if ( btn )
+            btn->GetEventHandler()->ProcessEvent(event);
+        else
+            // Bypass the event handling mechanism. Using it would be
+            // confusing for the platform-specific wxComboCtrl
+            // implementations.
+            m_combo->HandleButtonMouseEvent(event, 0);
+    }
  }
  
  }
  
+// ----------------------------------------------------------------------------
+// wxComboCtrlTextCtrl
+// ----------------------------------------------------------------------------
+
+class wxComboCtrlTextCtrl : public wxTextCtrl
+{
+public:
+    wxComboCtrlTextCtrl() : wxTextCtrl() { }
+    virtual ~wxComboCtrlTextCtrl() { }
+
+    virtual wxWindow *GetMainWindowOfCompositeControl()
+    {
+        wxComboCtrl* combo = (wxComboCtrl*) GetParent();
+
+        // Returning this instead of just 'parent' lets FindFocus work
+        // correctly even when parent control is a child of a composite
+        // generic control (as is case with wxGenericDatePickerCtrl).
+        return combo->GetMainWindowOfCompositeControl();
+    }
+};
+
  // ----------------------------------------------------------------------------
  // wxComboCtrlBase
  // ----------------------------------------------------------------------------
  
  
  BEGIN_EVENT_TABLE(wxComboCtrlBase, wxControl)
  // ----------------------------------------------------------------------------
  // wxComboCtrlBase
  // ----------------------------------------------------------------------------
  
  
  BEGIN_EVENT_TABLE(wxComboCtrlBase, wxControl)
-    EVT_TEXT(wxID_ANY,wxComboCtrlBase::OnTextCtrlEvent)
      EVT_SIZE(wxComboCtrlBase::OnSizeEvent)
      EVT_SET_FOCUS(wxComboCtrlBase::OnFocusEvent)
      EVT_KILL_FOCUS(wxComboCtrlBase::OnFocusEvent)
      EVT_SIZE(wxComboCtrlBase::OnSizeEvent)
      EVT_SET_FOCUS(wxComboCtrlBase::OnFocusEvent)
      EVT_KILL_FOCUS(wxComboCtrlBase::OnFocusEvent)
+    EVT_IDLE(wxComboCtrlBase::OnIdleEvent)
      //EVT_BUTTON(wxID_ANY,wxComboCtrlBase::OnButtonClickEvent)
      EVT_KEY_DOWN(wxComboCtrlBase::OnKeyEvent)
      //EVT_BUTTON(wxID_ANY,wxComboCtrlBase::OnButtonClickEvent)
      EVT_KEY_DOWN(wxComboCtrlBase::OnKeyEvent)
-    EVT_TEXT_ENTER(wxID_ANY,wxComboCtrlBase::OnTextCtrlEvent)
+    EVT_CHAR(wxComboCtrlBase::OnCharEvent)
      EVT_SYS_COLOUR_CHANGED(wxComboCtrlBase::OnSysColourChanged)
  END_EVENT_TABLE()
  
      EVT_SYS_COLOUR_CHANGED(wxComboCtrlBase::OnSysColourChanged)
  END_EVENT_TABLE()
  
@@ -615,20 +975,22 @@ IMPLEMENT_ABSTRACT_CLASS(wxComboCtrlBase, wxControl)
  
  void wxComboCtrlBase::Init()
  {
  
  void wxComboCtrlBase::Init()
  {
-    m_winPopup = (wxWindow *)NULL;
-    m_popup = (wxWindow *)NULL;
-    m_isPopupShown = false;
-    m_btn = (wxWindow*) NULL;
-    m_text = (wxTextCtrl*) NULL;
-    m_popupInterface = (wxComboPopup*) NULL;
+    m_winPopup = NULL;
+    m_popup = NULL;
+    m_popupWinState = Hidden;
+    m_btn = NULL;
+    m_text = NULL;
+    m_popupInterface = NULL;
  
  
-    m_popupExtraHandler = (wxEvtHandler*) NULL;
-    m_textEvtHandler = (wxEvtHandler*) NULL;
+    m_popupEvtHandler = NULL;
+    m_textEvtHandler = NULL;
  
  #if INSTALL_TOPLEV_HANDLER
  
  #if INSTALL_TOPLEV_HANDLER
-    m_toplevEvtHandler = (wxEvtHandler*) NULL;
+    m_toplevEvtHandler = NULL;
  #endif
  
  #endif
  
+    m_mainCtrlWnd = this;
+
      m_heightPopup = -1;
      m_widthMinPopup = -1;
      m_anchorSide = 0;
      m_heightPopup = -1;
      m_widthMinPopup = -1;
      m_anchorSide = 0;
@@ -639,15 +1001,20 @@ void wxComboCtrlBase::Init()
      m_btnWidDefault = 0;
      m_blankButtonBg = false;
      m_ignoreEvtText = 0;
      m_btnWidDefault = 0;
      m_blankButtonBg = false;
      m_ignoreEvtText = 0;
+    m_popupWinType = POPUPWIN_NONE;
      m_btnWid = m_btnHei = -1;
      m_btnSide = wxRIGHT;
      m_btnSpacingX = 0;
  
      m_extLeft = 0;
      m_extRight = 0;
      m_btnWid = m_btnHei = -1;
      m_btnSide = wxRIGHT;
      m_btnSpacingX = 0;
  
      m_extLeft = 0;
      m_extRight = 0;
-    m_absIndent = -1;
+    m_marginLeft = -1;
      m_iFlags = 0;
      m_iFlags = 0;
+    m_textCtrlStyle = 0;
      m_timeCanAcceptClick = 0;
      m_timeCanAcceptClick = 0;
+
+    m_resetFocus = false;
+    m_hasTcBgCol = false;
  }
  
  bool wxComboCtrlBase::Create(wxWindow *parent,
  }
  
  bool wxComboCtrlBase::Create(wxWindow *parent,
@@ -672,15 +1039,16 @@ bool wxComboCtrlBase::Create(wxWindow *parent,
  
      // Get colours
      OnThemeChange();
  
      // Get colours
      OnThemeChange();
-    m_absIndent = GetNativeTextIndent();
+    m_marginLeft = GetNativeTextIndent();
  
      m_iFlags |= wxCC_IFLAG_CREATED;
  
      // If x and y indicate valid size, wxSizeEvent won't be
  
      m_iFlags |= wxCC_IFLAG_CREATED;
  
      // If x and y indicate valid size, wxSizeEvent won't be
-    // emitted automatically, so we need to add artifical one.
+    // emitted automatically, so we need to add artificial one.
      if ( size.x > 0 && size.y > 0 )
      {
          wxSizeEvent evt(size,GetId());
      if ( size.x > 0 && size.y > 0 )
      {
          wxSizeEvent evt(size,GetId());
+        evt.SetEventObject(this);
          GetEventHandler()->AddPendingEvent(evt);
      }
  
          GetEventHandler()->AddPendingEvent(evt);
      }
  
@@ -697,7 +1065,7 @@ void wxComboCtrlBase::InstallInputHandlers()
  }
  
  void
  }
  
  void
-wxComboCtrlBase::CreateTextCtrl(int style, const wxValidator& validator)
+wxComboCtrlBase::CreateTextCtrl(int style)
  {
      if ( !(m_windowStyle & wxCB_READONLY) )
      {
  {
      if ( !(m_windowStyle & wxCB_READONLY) )
      {
@@ -708,7 +1076,7 @@ wxComboCtrlBase::CreateTextCtrl(int style, const wxValidator& validator)
          // not used by the wxPropertyGrid and therefore the tab is processed by
          // looking at ancestors to see if they have wxTAB_TRAVERSAL. The
          // navigation event is then sent to the wrong window.
          // not used by the wxPropertyGrid and therefore the tab is processed by
          // looking at ancestors to see if they have wxTAB_TRAVERSAL. The
          // navigation event is then sent to the wrong window.
-        style |= wxTE_PROCESS_TAB;
+        style |= wxTE_PROCESS_TAB | m_textCtrlStyle;
  
          if ( HasFlag(wxTE_PROCESS_ENTER) )
              style |= wxTE_PROCESS_ENTER;
  
          if ( HasFlag(wxTE_PROCESS_ENTER) )
              style |= wxTE_PROCESS_ENTER;
@@ -721,18 +1089,53 @@ wxComboCtrlBase::CreateTextCtrl(int style, const wxValidator& validator)
          else
              m_ignoreEvtText = 0;
  
          else
              m_ignoreEvtText = 0;
  
-        m_text = new wxTextCtrl(this, wxID_ANY, m_valueString,
-                                wxDefaultPosition, wxDefaultSize,
-                                style, validator);
-
-        // This is required for some platforms (GTK+ atleast)
-        m_text->SetSizeHints(2,4);
+        m_text = new wxComboCtrlTextCtrl();
+        m_text->Create(this, wxID_ANY, m_valueString,
+                       wxDefaultPosition, wxSize(10,-1),
+                       style);
+
+        // Connecting the events is currently the most reliable way
+        wxWindowID id = m_text->GetId();
+        m_text->Connect(id, wxEVT_COMMAND_TEXT_UPDATED,
+                        wxCommandEventHandler(wxComboCtrlBase::OnTextCtrlEvent),
+                        NULL, this);
+        m_text->Connect(id, wxEVT_COMMAND_TEXT_ENTER,
+                        wxCommandEventHandler(wxComboCtrlBase::OnTextCtrlEvent),
+                        NULL, this);
+
+        m_text->SetHint(m_hintText);
      }
  }
  
  void wxComboCtrlBase::OnThemeChange()
  {
      }
  }
  
  void wxComboCtrlBase::OnThemeChange()
  {
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+    // Because wxComboCtrl has transparent parts on most platforms, we
+    // don't want to touch the actual background colour. Instead, we just
+    // usually re-obtain m_tcBgCol here.
+
+#if defined(__WXMSW__) || defined(__WXGTK__)
+    wxVisualAttributes vattrs = wxComboBox::GetClassDefaultAttributes();
+#else
+    wxVisualAttributes vattrs;
+    vattrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+    vattrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+#endif
+
+    if ( !m_hasTcBgCol )
+        m_tcBgCol = vattrs.colBg;
+
+#ifndef __WXMAC__
+    // Only change the colours if application has not specified
+    // custom ones.
+    if ( !m_hasFgCol )
+    {
+        SetOwnForegroundColour(vattrs.colFg);
+    }
+    if ( !HasTransparentBackground() )
+    {
+        SetOwnBackgroundColour(GetParent()->GetBackgroundColour());
+    }
+#endif // !__WXMAC__
  }
  
  wxComboCtrlBase::~wxComboCtrlBase()
  }
  
  wxComboCtrlBase::~wxComboCtrlBase()
@@ -742,7 +1145,7 @@ wxComboCtrlBase::~wxComboCtrlBase()
  
  #if INSTALL_TOPLEV_HANDLER
      delete ((wxComboFrameEventHandler*)m_toplevEvtHandler);
  
  #if INSTALL_TOPLEV_HANDLER
      delete ((wxComboFrameEventHandler*)m_toplevEvtHandler);
-    m_toplevEvtHandler = (wxEvtHandler*) NULL;
+    m_toplevEvtHandler = NULL;
  #endif
  
      DestroyPopup();
  #endif
  
      DestroyPopup();
@@ -769,13 +1172,19 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth )
      // its platform default or bitmap+pushbutton background is used, but not if
      // there is vertical size adjustment or horizontal spacing.
      if ( ( (m_iFlags & wxCC_BUTTON_OUTSIDE_BORDER) ||
      // its platform default or bitmap+pushbutton background is used, but not if
      // there is vertical size adjustment or horizontal spacing.
      if ( ( (m_iFlags & wxCC_BUTTON_OUTSIDE_BORDER) ||
-                (m_bmpNormal.Ok() && m_blankButtonBg) ) &&
+                (m_bmpNormal.IsOk() && m_blankButtonBg) ) &&
           m_btnSpacingX == 0 &&
           m_btnHei <= 0 )
      {
          m_iFlags |= wxCC_IFLAG_BUTTON_OUTSIDE;
          btnBorder = 0;
      }
           m_btnSpacingX == 0 &&
           m_btnHei <= 0 )
      {
          m_iFlags |= wxCC_IFLAG_BUTTON_OUTSIDE;
          btnBorder = 0;
      }
+    else if ( (m_iFlags & wxCC_BUTTON_COVERS_BORDER) &&
+              m_btnSpacingX == 0 && !m_bmpNormal.IsOk() )
+    {
+        m_iFlags &= ~(wxCC_IFLAG_BUTTON_OUTSIDE);
+        btnBorder = 0;
+    }
      else
      {
          m_iFlags &= ~(wxCC_IFLAG_BUTTON_OUTSIDE);
      else
      {
          m_iFlags &= ~(wxCC_IFLAG_BUTTON_OUTSIDE);
@@ -783,8 +1192,8 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth )
      }
  
      // Defaul indentation
      }
  
      // Defaul indentation
-    if ( m_absIndent < 0 )
-        m_absIndent = GetNativeTextIndent();
+    if ( m_marginLeft < 0 )
+        m_marginLeft = GetNativeTextIndent();
  
      int butWidth = btnWidth;
  
  
      int butWidth = btnWidth;
  
@@ -828,7 +1237,7 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth )
      //   It is larger
      //   OR
      //   button width is set to default and blank button bg is not drawn
      //   It is larger
      //   OR
      //   button width is set to default and blank button bg is not drawn
-    if ( m_bmpNormal.Ok() )
+    if ( m_bmpNormal.IsOk() )
      {
          int bmpReqWidth = m_bmpNormal.GetWidth();
          int bmpReqHeight = m_bmpNormal.GetHeight();
      {
          int bmpReqWidth = m_bmpNormal.GetWidth();
          int bmpReqHeight = m_bmpNormal.GetHeight();
@@ -850,6 +1259,11 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth )
          {
              int newY = butHeight+(customBorder*2);
              SetClientSize(wxDefaultCoord,newY);
          {
              int newY = butHeight+(customBorder*2);
              SetClientSize(wxDefaultCoord,newY);
+            if ( m_bmpNormal.IsOk() || m_btnArea.width != butWidth || m_btnArea.height != butHeight )
+                m_iFlags |= wxCC_IFLAG_HAS_NONSTANDARD_BUTTON;
+            else
+                m_iFlags &= ~wxCC_IFLAG_HAS_NONSTANDARD_BUTTON;
+
              sz.y = newY;
          }
      }
              sz.y = newY;
          }
      }
@@ -860,14 +1274,14 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth )
      m_btnSize.y = butHeight;
  
      m_btnArea.x = ( m_btnSide==wxRIGHT ? sz.x - butAreaWid - btnBorder : btnBorder );
      m_btnSize.y = butHeight;
  
      m_btnArea.x = ( m_btnSide==wxRIGHT ? sz.x - butAreaWid - btnBorder : btnBorder );
-    m_btnArea.y = btnBorder;
+    m_btnArea.y = btnBorder + FOCUS_RING;
      m_btnArea.width = butAreaWid;
      m_btnArea.width = butAreaWid;
-    m_btnArea.height = sz.y - (btnBorder*2);
+    m_btnArea.height = sz.y - ((btnBorder+FOCUS_RING)*2);
  
  
-    m_tcArea.x = ( m_btnSide==wxRIGHT ? 0 : butAreaWid ) + customBorder;
-    m_tcArea.y = customBorder;
-    m_tcArea.width = sz.x - butAreaWid - (customBorder*2);
-    m_tcArea.height = sz.y - (customBorder*2);
+    m_tcArea.x = ( m_btnSide==wxRIGHT ? 0 : butAreaWid ) + customBorder + FOCUS_RING;
+    m_tcArea.y = customBorder + FOCUS_RING;
+    m_tcArea.width = sz.x - butAreaWid - (customBorder*2) - (FOCUS_RING*2);
+    m_tcArea.height = sz.y - ((customBorder+FOCUS_RING)*2);
  
  /*
      if ( m_text )
  
  /*
      if ( m_text )
@@ -884,42 +1298,63 @@ void wxComboCtrlBase::PositionTextCtrl( int textCtrlXAdjust, int textCtrlYAdjust
          return;
  
      wxSize sz = GetClientSize();
          return;
  
      wxSize sz = GetClientSize();
-    int customBorder = m_widthCustomBorder;
  
  
-#if !TEXTCTRL_TEXT_CENTERED
+    int customBorder = m_widthCustomBorder;
      if ( (m_text->GetWindowStyleFlag() & wxBORDER_MASK) == wxNO_BORDER )
      {
      if ( (m_text->GetWindowStyleFlag() & wxBORDER_MASK) == wxNO_BORDER )
      {
-        // Centre textctrl
+        int x;
+
+        if ( !m_widthCustomPaint )
+        {
+            // No special custom paint area - we can use 0 left margin
+            // with wxTextCtrl.
+            if ( m_text->SetMargins(0) )
+                textCtrlXAdjust = 0;
+            x = m_tcArea.x + m_marginLeft + textCtrlXAdjust;
+        }
+        else
+        {
+            // There is special custom paint area - it is better to
+            // use some margin with the wxTextCtrl.
+            m_text->SetMargins(m_marginLeft);
+            x = m_tcArea.x + m_widthCustomPaint +
+                m_marginLeft + textCtrlXAdjust;
+        }
+
+        // Centre textctrl vertically, if needed
+#if !TEXTCTRL_TEXT_CENTERED
          int tcSizeY = m_text->GetBestSize().y;
          int tcSizeY = m_text->GetBestSize().y;
-        int diff = sz.y - tcSizeY;
-        int y = textCtrlYAdjust + (diff/2);
+        int diff0 = sz.y - tcSizeY;
+        int y = textCtrlYAdjust + (diff0/2);
+#else
+        wxUnusedVar(textCtrlYAdjust);
+        int y = 0;
+#endif
  
          if ( y < customBorder )
              y = customBorder;
  
  
          if ( y < customBorder )
              y = customBorder;
  
-        m_text->SetSize( m_tcArea.x + m_widthCustomPaint + m_absIndent + textCtrlXAdjust,
-                         y,
-                         m_tcArea.width - COMBO_MARGIN -
-                         (textCtrlXAdjust + m_widthCustomPaint + m_absIndent),
-                         -1 );
+        m_text->SetSize(x,
+                        y,
+                        m_tcArea.width - m_tcArea.x - x,
+                        -1 );
  
          // Make sure textctrl doesn't exceed the bottom custom border
          wxSize tsz = m_text->GetSize();
  
          // Make sure textctrl doesn't exceed the bottom custom border
          wxSize tsz = m_text->GetSize();
-        diff = (y + tsz.y) - (sz.y - customBorder);
-        if ( diff >= 0 )
+        int diff1 = (y + tsz.y) - (sz.y - customBorder);
+        if ( diff1 >= 0 )
          {
          {
-            tsz.y = tsz.y - diff - 1;
+            tsz.y = tsz.y - diff1 - 1;
              m_text->SetSize(tsz);
          }
      }
      else
              m_text->SetSize(tsz);
          }
      }
      else
-#endif
      {
      {
-        // If it has border, have textctrl will the entire text field.
+        // If it has border, have textctrl fill the entire text field.
          m_text->SetSize( m_tcArea.x + m_widthCustomPaint,
          m_text->SetSize( m_tcArea.x + m_widthCustomPaint,
-                         customBorder,
-                         sz.x - m_btnArea.width - m_widthCustomPaint - customBorder,
-                         sz.y-(customBorder*2) );
+                         m_tcArea.y,
+                         m_tcArea.width - m_widthCustomPaint,
+                         m_tcArea.height );
      }
  }
  
      }
  }
  
@@ -933,16 +1368,16 @@ wxSize wxComboCtrlBase::DoGetBestSize() const
      // TODO: Better method to calculate close-to-native control height.
  
      int fhei;
      // TODO: Better method to calculate close-to-native control height.
  
      int fhei;
-    if ( m_font.Ok() )
+    if ( m_font.IsOk() )
          fhei = (m_font.GetPointSize()*2) + 5;
          fhei = (m_font.GetPointSize()*2) + 5;
-    else if ( wxNORMAL_FONT->Ok() )
+    else if ( wxNORMAL_FONT->IsOk() )
          fhei = (wxNORMAL_FONT->GetPointSize()*2) + 5;
      else
          fhei = sizeText.y + 4;
  
      // Need to force height to accomodate bitmap?
      int btnSizeY = m_btnSize.y;
          fhei = (wxNORMAL_FONT->GetPointSize()*2) + 5;
      else
          fhei = sizeText.y + 4;
  
      // Need to force height to accomodate bitmap?
      int btnSizeY = m_btnSize.y;
-    if ( m_bmpNormal.Ok() && fhei < btnSizeY )
+    if ( m_bmpNormal.IsOk() && fhei < btnSizeY )
          fhei = btnSizeY;
  
      // Control height doesn't depend on border
          fhei = btnSizeY;
  
      // Control height doesn't depend on border
@@ -963,9 +1398,27 @@ wxSize wxComboCtrlBase::DoGetBestSize() const
      fhei += 1;
  #endif
  
      fhei += 1;
  #endif
  
-    wxSize ret(sizeText.x + COMBO_MARGIN + DEFAULT_DROPBUTTON_WIDTH,
-               fhei);
+#ifdef __WXMAC__
+    // these are the numbers from the HIG:
+    switch ( m_windowVariant )
+    {
+        case wxWINDOW_VARIANT_NORMAL:
+        default :
+            fhei = 22;
+            break;
+        case wxWINDOW_VARIANT_SMALL:
+            fhei = 19;
+            break;
+        case wxWINDOW_VARIANT_MINI:
+            fhei = 15;
+            break;
+    }
+#endif
+
+    fhei += 2 * FOCUS_RING;
+    int width = sizeText.x + FOCUS_RING + COMBO_MARGIN + DEFAULT_DROPBUTTON_WIDTH;
  
  
+    wxSize ret(width, fhei);
      CacheBestSize(ret);
      return ret;
  }
      CacheBestSize(ret);
      return ret;
  }
@@ -995,6 +1448,8 @@ bool wxComboCtrlBase::Enable(bool enable)
      if ( m_text )
          m_text->Enable(enable);
  
      if ( m_text )
          m_text->Enable(enable);
  
+    Refresh();
+
      return true;
  }
  
      return true;
  }
  
@@ -1017,8 +1472,15 @@ bool wxComboCtrlBase::SetFont ( const wxFont& font )
      if ( !wxControl::SetFont(font) )
          return false;
  
      if ( !wxControl::SetFont(font) )
          return false;
  
-    if (m_text)
+    if ( m_text )
+    {
+        // Without hiding the wxTextCtrl there would be some
+        // visible 'flicker' (at least on Windows XP).
+        m_text->Hide();
          m_text->SetFont(font);
          m_text->SetFont(font);
+        OnResize();
+        m_text->Show();
+    }
  
      return true;
  }
  
      return true;
  }
@@ -1037,12 +1499,39 @@ void wxComboCtrlBase::DoSetToolTip(wxToolTip *tooltip)
      }
      else
      {
      }
      else
      {
-        if ( m_text ) m_text->SetToolTip( (wxToolTip*) NULL );
-        if ( m_btn ) m_btn->SetToolTip( (wxToolTip*) NULL );
+        if ( m_text ) m_text->SetToolTip( NULL );
+        if ( m_btn ) m_btn->SetToolTip( NULL );
      }
  }
  #endif // wxUSE_TOOLTIPS
  
      }
  }
  #endif // wxUSE_TOOLTIPS
  
+bool wxComboCtrlBase::SetForegroundColour(const wxColour& colour)
+{
+    if ( wxControl::SetForegroundColour(colour) )
+    {
+        if ( m_text )
+            m_text->SetForegroundColour(colour);
+        return true;
+    }
+    return false;
+}
+
+bool wxComboCtrlBase::SetBackgroundColour(const wxColour& colour)
+{
+    if ( m_text )
+        m_text->SetBackgroundColour(colour);
+    m_tcBgCol = colour;
+    m_hasTcBgCol = true;
+    return true;
+}
+
+wxColour wxComboCtrlBase::GetBackgroundColour() const
+{
+    if ( m_text )
+        return m_text->GetBackgroundColour();
+    return m_tcBgCol;
+}
+
  // ----------------------------------------------------------------------------
  // painting
  // ----------------------------------------------------------------------------
  // ----------------------------------------------------------------------------
  // painting
  // ----------------------------------------------------------------------------
@@ -1053,7 +1542,7 @@ void wxComboCtrlBase::PrepareBackground( wxDC& dc, const wxRect& rect, int flags
  {
      wxSize sz = GetClientSize();
      bool isEnabled;
  {
      wxSize sz = GetClientSize();
      bool isEnabled;
-    bool isFocused; // also selected
+    bool doDrawFocusRect; // also selected
  
      // For smaller size control (and for disabled background) use less spacing
      int focusSpacingX;
  
      // For smaller size control (and for disabled background) use less spacing
      int focusSpacingX;
@@ -1063,7 +1552,7 @@ void wxComboCtrlBase::PrepareBackground( wxDC& dc, const wxRect& rect, int flags
      {
          // Drawing control
          isEnabled = IsEnabled();
      {
          // Drawing control
          isEnabled = IsEnabled();
-        isFocused = ShouldDrawFocus();
+        doDrawFocusRect = ShouldDrawFocus() && !(m_iFlags & wxCC_FULL_BUTTON);
  
          // Windows-style: for smaller size control (and for disabled background) use less spacing
          focusSpacingX = isEnabled ? 2 : 1;
  
          // Windows-style: for smaller size control (and for disabled background) use less spacing
          focusSpacingX = isEnabled ? 2 : 1;
@@ -1073,7 +1562,7 @@ void wxComboCtrlBase::PrepareBackground( wxDC& dc, const wxRect& rect, int flags
      {
          // Drawing a list item
          isEnabled = true; // they are never disabled
      {
          // Drawing a list item
          isEnabled = true; // they are never disabled
-        isFocused = flags & wxCONTROL_SELECTED ? true : false;
+        doDrawFocusRect = (flags & wxCONTROL_SELECTED) != 0;
  
          focusSpacingX = 0;
          focusSpacingY = 0;
  
          focusSpacingX = 0;
          focusSpacingY = 0;
@@ -1093,31 +1582,70 @@ void wxComboCtrlBase::PrepareBackground( wxDC& dc, const wxRect& rect, int flags
      selRect.width -= wcp + (focusSpacingX*2);
  
      wxColour bgCol;
      selRect.width -= wcp + (focusSpacingX*2);
  
      wxColour bgCol;
+    wxColour fgCol;
  
  
+    bool doDrawSelRect = true;
+
+    // Determine foreground colour
      if ( isEnabled )
      {
      if ( isEnabled )
      {
-        // If popup is hidden and this control is focused,
-        // then draw the focus-indicator (selbgcolor background etc.).
-        if ( isFocused )
+        if ( doDrawFocusRect )
          {
          {
-            dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT) );
-            bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
+            fgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
          }
          }
-        else
+        else if ( m_hasFgCol )
          {
          {
-            dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT) );
-            bgCol = GetBackgroundColour();
+            // Honour the custom foreground colour
+            fgCol = GetForegroundColour();
+        }
+        else
+        {
+            fgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+        }
+    }
+    else
+    {
+        fgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT);
+    }
+
+    // Determine background colour
+    if ( isEnabled )
+    {
+        if ( doDrawFocusRect )
+        {
+            bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
+        }
+        else if ( m_hasTcBgCol )
+        {
+            // Honour the custom background colour
+            bgCol = m_tcBgCol;
+        }
+        else
+        {
+#ifndef __WXMAC__  // see note in OnThemeChange
+            doDrawSelRect = false;
+            bgCol = GetBackgroundColour();
+#else
+            bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+#endif
          }
      }
      else
      {
          }
      }
      else
      {
-        dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT) );
+#ifndef __WXMAC__  // see note in OnThemeChange
          bgCol = GetBackgroundColour();
          bgCol = GetBackgroundColour();
+#else
+        bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+#endif
      }
  
      }
  
+    dc.SetTextForeground( fgCol );
      dc.SetBrush( bgCol );
      dc.SetBrush( bgCol );
-    dc.SetPen( bgCol );
-    dc.DrawRectangle( selRect );
+    if ( doDrawSelRect )
+    {
+        dc.SetPen( bgCol );
+        dc.DrawRectangle( selRect );
+    }
  
      // Don't clip exactly to the selection rectangle so we can draw
      // to the non-selected area in front of it.
  
      // Don't clip exactly to the selection rectangle so we can draw
      // to the non-selected area in front of it.
@@ -1132,14 +1660,13 @@ void wxComboCtrlBase::PrepareBackground( wxDC&, const wxRect&, int ) const
  }
  #endif
  
  }
  #endif
  
-void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, bool paintBg )
+void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, int flags )
  {
      int drawState = m_btnState;
  
  {
      int drawState = m_btnState;
  
-#ifdef __WXGTK__
-    if ( m_isPopupShown )
+    if ( (m_iFlags & wxCC_BUTTON_STAYS_DOWN) &&
+         GetPopupWindowState() >= Animating )
          drawState |= wxCONTROL_PRESSED;
          drawState |= wxCONTROL_PRESSED;
-#endif
  
      wxRect drawRect(rect.x+m_btnSpacingX,
                      rect.y+((rect.height-m_btnSize.y)/2),
  
      wxRect drawRect(rect.x+m_btnSpacingX,
                      rect.y+((rect.height-m_btnSize.y)/2),
@@ -1157,22 +1684,28 @@ void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, bool paintBg )
      if ( !enabled )
          drawState |= wxCONTROL_DISABLED;
  
      if ( !enabled )
          drawState |= wxCONTROL_DISABLED;
  
-    if ( !m_bmpNormal.Ok() )
+    // Need to clear button background even if m_btn is present
+    // and also when using custom bitmap for the button
+    if ( (flags & Button_PaintBackground) &&
+            (!HasTransparentBackground() ||
+             !(m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE)) )
      {
      {
-        // Need to clear button background even if m_btn is present
-        if ( paintBg )
-        {
-            wxColour bgCol;
+        wxColour bgCol;
  
  
-            if ( m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE )
-                bgCol = GetParent()->GetBackgroundColour();
-            else
-                bgCol = GetBackgroundColour();
+        if ( m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE )
+            bgCol = GetParent()->GetBackgroundColour();
+        else
+            bgCol = GetBackgroundColour();
  
  
-            dc.SetBrush(bgCol);
-            dc.SetPen(bgCol);
-            dc.DrawRectangle(rect);
-        }
+        dc.SetBrush(bgCol);
+        dc.SetPen(bgCol);
+        dc.DrawRectangle(rect);
+    }
+
+    if ( !m_bmpNormal.IsOk() )
+    {
+        if ( flags & Button_BitmapOnly )
+            return;
  
          // Draw standard button
          wxRendererNative::Get().DrawComboBoxDropButton(this,
  
          // Draw standard button
          wxRendererNative::Get().DrawComboBoxDropButton(this,
@@ -1197,30 +1730,13 @@ void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, bool paintBg )
  
          if ( m_blankButtonBg )
          {
  
          if ( m_blankButtonBg )
          {
-            // If using blank button background, we need to clear its background
-            // with button face colour instead of colour for rest of the control.
-            if ( paintBg )
+            if ( !(flags & Button_BitmapOnly) )
              {
              {
-                wxColour bgCol = GetParent()->GetBackgroundColour(); //wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
-                //wxColour bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
-                dc.SetPen(bgCol);
-                dc.SetBrush(bgCol);
-                dc.DrawRectangle(rect);
+                wxRendererNative::Get().DrawPushButton(this,
+                                                       dc,
+                                                       drawRect,
+                                                       drawState);
              }
              }
-
-            wxRendererNative::Get().DrawPushButton(this,
-                                                   dc,
-                                                   drawRect,
-                                                   drawState);
-
-        }
-        else
-
-        {
-            // Need to clear button background even if m_btn is present
-            // (assume non-button background was cleared just before this call so brushes are good)
-            if ( paintBg )
-                dc.DrawRectangle(rect);
          }
  
          // Draw bitmap centered in drawRect
          }
  
          // Draw bitmap centered in drawRect
@@ -1236,6 +1752,7 @@ void wxComboCtrlBase::RecalcAndRefresh()
      if ( IsCreated() )
      {
          wxSizeEvent evt(GetSize(),GetId());
      if ( IsCreated() )
      {
          wxSizeEvent evt(GetSize(),GetId());
+        evt.SetEventObject(this);
          GetEventHandler()->ProcessEvent(evt);
          Refresh();
      }
          GetEventHandler()->ProcessEvent(evt);
          Refresh();
      }
@@ -1247,6 +1764,13 @@ void wxComboCtrlBase::RecalcAndRefresh()
  
  void wxComboCtrlBase::OnTextCtrlEvent(wxCommandEvent& event)
  {
  
  void wxComboCtrlBase::OnTextCtrlEvent(wxCommandEvent& event)
  {
+    // Avoid infinite recursion
+    if ( event.GetEventObject() == this )
+    {
+        event.Skip();
+        return;
+    }
+
      if ( event.GetEventType() == wxEVT_COMMAND_TEXT_UPDATED )
      {
          if ( m_ignoreEvtText > 0 )
      if ( event.GetEventType() == wxEVT_COMMAND_TEXT_UPDATED )
      {
          if ( m_ignoreEvtText > 0 )
@@ -1256,23 +1780,25 @@ void wxComboCtrlBase::OnTextCtrlEvent(wxCommandEvent& event)
          }
      }
  
          }
      }
  
-    // Change event id, object and string before relaying it forward
-    event.SetId(GetId());
-    wxString s = event.GetString();
-    event.SetEventObject(this);
-    event.SetString(s);
-    event.Skip();
+    // For safety, completely re-create a new wxCommandEvent
+    wxCommandEvent evt2(event);
+    evt2.SetId(GetId());
+    evt2.SetEventObject(this);
+    HandleWindowEvent(evt2);
+
+    event.StopPropagation();
  }
  
  // call if cursor is on button area or mouse is captured for the button
  bool wxComboCtrlBase::HandleButtonMouseEvent( wxMouseEvent& event,
  }
  
  // call if cursor is on button area or mouse is captured for the button
  bool wxComboCtrlBase::HandleButtonMouseEvent( wxMouseEvent& event,
-                                                 int flags )
+                                              int flags )
  {
      int type = event.GetEventType();
  
      if ( type == wxEVT_MOTION )
      {
  {
      int type = event.GetEventType();
  
      if ( type == wxEVT_MOTION )
      {
-        if ( flags & wxCC_MF_ON_BUTTON )
+        if ( (flags & wxCC_MF_ON_BUTTON) &&
+             IsPopupWindowState(Hidden) )
          {
              if ( !(m_btnState & wxCONTROL_CURRENT) )
              {
          {
              if ( !(m_btnState & wxCONTROL_CURRENT) )
              {
@@ -1290,7 +1816,7 @@ bool wxComboCtrlBase::HandleButtonMouseEvent( wxMouseEvent& event,
              Refresh();
          }
      }
              Refresh();
          }
      }
-    else if ( type == wxEVT_LEFT_DOWN )
+    else if ( type == wxEVT_LEFT_DOWN || type == wxEVT_LEFT_DCLICK )
      {
          if ( flags & (wxCC_MF_ON_CLICK_AREA|wxCC_MF_ON_BUTTON) )
          {
      {
          if ( flags & (wxCC_MF_ON_CLICK_AREA|wxCC_MF_ON_BUTTON) )
          {
@@ -1331,7 +1857,7 @@ bool wxComboCtrlBase::HandleButtonMouseEvent( wxMouseEvent& event,
              m_btnState &= ~(wxCONTROL_CURRENT);
  
              // Mouse hover ends
              m_btnState &= ~(wxCONTROL_CURRENT);
  
              // Mouse hover ends
-            if ( !m_isPopupShown )
+            if ( IsPopupWindowState(Hidden) )
              {
                  m_btnState &= ~(wxCONTROL_PRESSED);
                  Refresh();
              {
                  m_btnState &= ~(wxCONTROL_PRESSED);
                  Refresh();
@@ -1341,6 +1867,11 @@ bool wxComboCtrlBase::HandleButtonMouseEvent( wxMouseEvent& event,
      else
          return false;
  
      else
          return false;
  
+    // Never have 'hot' state when popup is being shown
+    // (this is mostly needed because of the animation).
+    if ( !IsPopupWindowState(Hidden) )
+        m_btnState &= ~wxCONTROL_CURRENT;
+
      return true;
  }
  
      return true;
  }
  
@@ -1351,16 +1882,19 @@ bool wxComboCtrlBase::PreprocessMouseEvent( wxMouseEvent& event,
      wxLongLong t = ::wxGetLocalTimeMillis();
      int evtType = event.GetEventType();
  
      wxLongLong t = ::wxGetLocalTimeMillis();
      int evtType = event.GetEventType();
  
-#if !USE_TRANSIENT_POPUP
-    if ( m_isPopupShown &&
-         ( evtType == wxEVT_LEFT_DOWN || evtType == wxEVT_RIGHT_DOWN ) )
+#if USES_WXPOPUPWINDOW || USES_GENERICTLW
+    if ( m_popupWinType != POPUPWIN_WXPOPUPTRANSIENTWINDOW )
      {
      {
-        HidePopup();
-        return true;
+        if ( IsPopupWindowState(Visible) &&
+             ( evtType == wxEVT_LEFT_DOWN || evtType == wxEVT_RIGHT_DOWN ) )
+        {
+            HidePopup(true);
+            return true;
+        }
      }
  #endif
  
      }
  #endif
  
-    // Filter out clicks on button immediately after popup dismiss (Windows like behaviour)
+    // Filter out clicks on button immediately after popup dismiss
      if ( evtType == wxEVT_LEFT_DOWN && t < m_timeCanAcceptClick )
      {
          event.SetEventType(0);
      if ( evtType == wxEVT_LEFT_DOWN && t < m_timeCanAcceptClick )
      {
          event.SetEventType(0);
@@ -1377,13 +1911,12 @@ void wxComboCtrlBase::HandleNormalMouseEvent( wxMouseEvent& event )
      if ( (evtType == wxEVT_LEFT_DOWN || evtType == wxEVT_LEFT_DCLICK) &&
           (m_windowStyle & wxCB_READONLY) )
      {
      if ( (evtType == wxEVT_LEFT_DOWN || evtType == wxEVT_LEFT_DCLICK) &&
           (m_windowStyle & wxCB_READONLY) )
      {
-        if ( m_isPopupShown )
+        if ( GetPopupWindowState() >= Animating )
          {
          {
-    #if !wxUSE_POPUPWIN
-        // Normally do nothing - evt handler should close it for us
-    #elif !USE_TRANSIENT_POPUP
+    #if USES_WXPOPUPWINDOW
              // Click here always hides the popup.
              // Click here always hides the popup.
-            HidePopup();
+            if ( m_popupWinType == POPUPWIN_WXPOPUPWINDOW )
+                HidePopup(true);
      #endif
          }
          else
      #endif
          }
          else
@@ -1403,15 +1936,35 @@ void wxComboCtrlBase::HandleNormalMouseEvent( wxMouseEvent& event )
              }
          }
      }
              }
          }
      }
-    else
-    if ( m_isPopupShown )
+    else if ( evtType == wxEVT_MOUSEWHEEL )
      {
      {
-        // relay (some) mouse events to the popup
-        if ( evtType == wxEVT_MOUSEWHEEL )
-            m_popup->AddPendingEvent(event);
+        if ( IsPopupShown() )
+        {
+            // relay (some) mouse events to the popup
+            m_popup->GetEventHandler()->ProcessEvent(event);
+        }
+        else if ( event.GetWheelAxis() == 0 &&
+                  event.GetWheelRotation() != 0 &&
+                  event.GetModifiers() == 0 )
+        {
+            // Translate mousewheel actions into key up/down. This is
+            // the simplest way of getting native behaviour: scrolling the
+            // wheel moves selection up/down by one item.
+            wxKeyEvent kevent(wxEVT_KEY_DOWN);
+            kevent.m_keyCode = event.GetWheelRotation() > 0
+                               ? WXK_UP
+                               : WXK_DOWN;
+            GetEventHandler()->ProcessEvent(kevent);
+        }
+        else
+        {
+            event.Skip();
+        }
      }
      else if ( evtType )
      }
      else if ( evtType )
+    {
          event.Skip();
          event.Skip();
+    }
  }
  
  void wxComboCtrlBase::OnKeyEvent(wxKeyEvent& event)
  }
  
  void wxComboCtrlBase::OnKeyEvent(wxKeyEvent& event)
@@ -1419,21 +1972,16 @@ void wxComboCtrlBase::OnKeyEvent(wxKeyEvent& event)
      if ( IsPopupShown() )
      {
          // pass it to the popped up control
      if ( IsPopupShown() )
      {
          // pass it to the popped up control
-        GetPopupControl()->GetControl()->AddPendingEvent(event);
+        GetPopupControl()->GetControl()->GetEventHandler()->ProcessEvent(event);
      }
      else // no popup
      {
      }
      else // no popup
      {
-        int keycode = event.GetKeyCode();
+        wxWindow* mainCtrl = GetMainWindowOfCompositeControl();
  
  
-        if ( keycode == WXK_TAB )
+        if ( mainCtrl->GetParent()->HasFlag(wxTAB_TRAVERSAL) )
          {
          {
-            wxNavigationKeyEvent evt;
-            evt.SetFlags(wxNavigationKeyEvent::FromTab|
-                         (!event.ShiftDown() ? wxNavigationKeyEvent::IsForward
-                                             : wxNavigationKeyEvent::IsBackward));
-            evt.SetEventObject(this);
-            GetParent()->GetEventHandler()->AddPendingEvent(evt);
-            return;
+            if ( mainCtrl->HandleAsNavigationKey(event) )
+                return;
          }
  
          if ( IsKeyPopupToggle(event) )
          }
  
          if ( IsKeyPopupToggle(event) )
@@ -1451,6 +1999,8 @@ void wxComboCtrlBase::OnKeyEvent(wxKeyEvent& event)
              return;
          }
  
              return;
          }
  
+        int keycode = event.GetKeyCode();
+
          if ( (comboStyle & wxCB_READONLY) ||
               (keycode != WXK_RIGHT && keycode != WXK_LEFT) )
          {
          if ( (comboStyle & wxCB_READONLY) ||
               (keycode != WXK_RIGHT && keycode != WXK_LEFT) )
          {
@@ -1461,23 +2011,58 @@ void wxComboCtrlBase::OnKeyEvent(wxKeyEvent& event)
      }
  }
  
      }
  }
  
+void wxComboCtrlBase::OnCharEvent(wxKeyEvent& event)
+{
+    if ( IsPopupShown() )
+    {
+        // pass it to the popped up control
+        GetPopupControl()->GetControl()->GetEventHandler()->ProcessEvent(event);
+    }
+    else // no popup
+    {
+        wxComboPopup* popupInterface = GetPopupControl();
+        if ( popupInterface )
+        {
+            popupInterface->OnComboCharEvent(event);
+        }
+        else
+        {
+            event.Skip();
+        }
+    }
+}
+
  void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& event )
  {
      if ( event.GetEventType() == wxEVT_SET_FOCUS )
      {
  void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& event )
  {
      if ( event.GetEventType() == wxEVT_SET_FOCUS )
      {
-        if ( m_text && m_text != ::wxWindow::FindFocus() )
-            m_text->SetFocus();
+        wxWindow* tc = GetTextCtrl();
+        if ( tc && tc != DoFindFocus() )
+        {
+            tc->SetFocus();
+        }
      }
  
      Refresh();
  }
  
      }
  
      Refresh();
  }
  
+void wxComboCtrlBase::OnIdleEvent( wxIdleEvent& WXUNUSED(event) )
+{
+    if ( m_resetFocus )
+    {
+        m_resetFocus = false;
+        wxWindow* tc = GetTextCtrl();
+        if ( tc )
+            tc->SetFocus();
+    }
+}
+
  void wxComboCtrlBase::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
  {
      OnThemeChange();
  void wxComboCtrlBase::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
  {
      OnThemeChange();
-    // indentation may also have changed
-    if ( !(m_iFlags & wxCC_IFLAG_INDENT_SET) )
-        m_absIndent = GetNativeTextIndent();
+    // left margin may also have changed
+    if ( !(m_iFlags & wxCC_IFLAG_LEFT_MARGIN_SET) )
+        m_marginLeft = GetNativeTextIndent();
      RecalcAndRefresh();
  }
  
      RecalcAndRefresh();
  }
  
@@ -1492,13 +2077,45 @@ void wxComboCtrlBase::CreatePopup()
      wxWindow* popup;
  
      if ( !m_winPopup )
      wxWindow* popup;
  
      if ( !m_winPopup )
-        m_winPopup = new wxComboPopupWindow( this, wxNO_BORDER );
+    {
+#ifdef wxComboPopupWindowBase2
+        if ( m_iFlags & wxCC_IFLAG_USE_ALT_POPUP )
+        {
+        #if !USES_GENERICTLW
+            m_winPopup = new wxComboPopupWindowBase2( this, wxNO_BORDER );
+        #else
+            int tlwFlags = wxNO_BORDER;
+          #ifdef wxCC_GENERIC_TLW_IS_FRAME
+            tlwFlags |= wxFRAME_NO_TASKBAR;
+          #endif
+
+          #ifdef wxCC_GENERIC_TLW_IS_NONOWNEDWINDOW
+            m_winPopup = new wxComboPopupWindowBase2( this, wxID_ANY,
+                                                      wxPoint(-21,-21), wxSize(20, 20),
+                                                      tlwFlags );
+          #else
+            m_winPopup = new wxComboPopupWindowBase2( this, wxID_ANY, wxEmptyString,
+                                                      wxPoint(-21,-21), wxSize(20, 20),
+                                                      tlwFlags );
+          #endif
+        #endif
+            m_popupWinType = SECONDARY_POPUP_TYPE;
+        }
+        else
+#endif // wxComboPopupWindowBase2
+        {
+            m_winPopup = new wxComboPopupWindow( this, wxNO_BORDER );
+            m_popupWinType = PRIMARY_POPUP_TYPE;
+        }
+        m_popupWinEvtHandler = new wxComboPopupWindowEvtHandler(this);
+        m_winPopup->PushEventHandler(m_popupWinEvtHandler);
+    }
  
      popupInterface->Create(m_winPopup);
      m_popup = popup = popupInterface->GetControl();
  
  
      popupInterface->Create(m_winPopup);
      m_popup = popup = popupInterface->GetControl();
  
-    m_popupExtraHandler = new wxComboPopupExtraEventHandler(this);
-    popup->PushEventHandler( m_popupExtraHandler );
+    m_popupEvtHandler = new wxComboPopupEvtHandler(this);
+    popup->PushEventHandler( m_popupEvtHandler );
  
      // This may be helpful on some platforms
      //   (eg. it bypasses a wxGTK popupwindow bug where
  
      // This may be helpful on some platforms
      //   (eg. it bypasses a wxGTK popupwindow bug where
@@ -1511,22 +2128,29 @@ void wxComboCtrlBase::CreatePopup()
  // Destroy popup window and the child control
  void wxComboCtrlBase::DestroyPopup()
  {
  // Destroy popup window and the child control
  void wxComboCtrlBase::DestroyPopup()
  {
-    HidePopup();
+    HidePopup(true);
  
      if ( m_popup )
  
      if ( m_popup )
-        m_popup->RemoveEventHandler(m_popupExtraHandler);
+        m_popup->RemoveEventHandler(m_popupEvtHandler);
  
  
-    delete m_popupExtraHandler;
+    wxDELETE(m_popupEvtHandler);
  
  
-    delete m_popupInterface;
+    if ( m_popupInterface )
+    {
+        // NB: DestroyPopup() performs 'delete this'.
+        m_popupInterface->DestroyPopup();
+        m_popupInterface = NULL;
+    }
  
      if ( m_winPopup )
  
      if ( m_winPopup )
+    {
+        m_winPopup->RemoveEventHandler(m_popupWinEvtHandler);
+        wxDELETE(m_popupWinEvtHandler);
          m_winPopup->Destroy();
          m_winPopup->Destroy();
+        m_winPopup = NULL;
+    }
  
  
-    m_popupExtraHandler = (wxEvtHandler*) NULL;
-    m_popupInterface = (wxComboPopup*) NULL;
-    m_winPopup = (wxWindow*) NULL;
-    m_popup = (wxWindow*) NULL;
+    m_popup = NULL;
  }
  
  void wxComboCtrlBase::DoSetPopupControl(wxComboPopup* iface)
  }
  
  void wxComboCtrlBase::DoSetPopupControl(wxComboPopup* iface)
@@ -1546,11 +2170,11 @@ void wxComboCtrlBase::DoSetPopupControl(wxComboPopup* iface)
      }
      else
      {
      }
      else
      {
-        m_popup = (wxWindow*) NULL;
+        m_popup = NULL;
      }
  
      // This must be done after creation
      }
  
      // This must be done after creation
-    if ( m_valueString.length() )
+    if ( !m_valueString.empty() )
      {
          iface->SetStringValue(m_valueString);
          //Refresh();
      {
          iface->SetStringValue(m_valueString);
          //Refresh();
@@ -1568,13 +2192,39 @@ void wxComboCtrlBase::OnButtonClick()
  {
      // Derived classes can override this method for totally custom
      // popup action
  {
      // Derived classes can override this method for totally custom
      // popup action
+    switch ( GetPopupWindowState() )
+    {
+        case Hidden:
+        {
+            Popup();
+            break;
+        }
+
+        case Animating:
+        case Visible:
+        {
+            HidePopup(true);
+            break;
+        }
+    }
+}
+
+void wxComboCtrlBase::Popup()
+{
+    wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_DROPDOWN, GetId());
+    event.SetEventObject(this);
+    HandleWindowEvent(event);
+
      ShowPopup();
  }
  
  void wxComboCtrlBase::ShowPopup()
  {
      EnsurePopupControl();
      ShowPopup();
  }
  
  void wxComboCtrlBase::ShowPopup()
  {
      EnsurePopupControl();
-    wxCHECK_RET( !IsPopupShown(), wxT("popup window already shown") );
+    wxCHECK_RET( !IsPopupWindowState(Visible), wxT("popup window already shown") );
+
+    if ( IsPopupWindowState(Animating) )
+        return;
  
      SetFocus();
  
  
      SetFocus();
  
@@ -1612,7 +2262,8 @@ void wxComboCtrlBase::ShowPopup()
      //     that if transient popup is open, then tab traversal is to be ignored.
      //     However, I think this code would still be needed for cases where
      //     transient popup doesn't work yet (wxWinCE?).
      //     that if transient popup is open, then tab traversal is to be ignored.
      //     However, I think this code would still be needed for cases where
      //     transient popup doesn't work yet (wxWinCE?).
-    wxWindow* parent = GetParent();
+    wxWindow* mainCtrl = GetMainWindowOfCompositeControl();
+    wxWindow* parent = mainCtrl->GetParent();
      int parentFlags = parent->GetWindowStyle();
      if ( parentFlags & wxTAB_TRAVERSAL )
      {
      int parentFlags = parent->GetWindowStyle();
      if ( parentFlags & wxTAB_TRAVERSAL )
      {
@@ -1631,6 +2282,8 @@ void wxComboCtrlBase::ShowPopup()
          popup = m_popup;
      }
  
          popup = m_popup;
      }
  
+    winPopup->Enable();
+
      wxASSERT( !m_popup || m_popup == popup ); // Consistency check.
  
      wxSize adjustedSize = m_popupInterface->GetAdjustedSize(widthPopup,
      wxASSERT( !m_popup || m_popup == popup ); // Consistency check.
  
      wxSize adjustedSize = m_popupInterface->GetAdjustedSize(widthPopup,
@@ -1657,6 +2310,10 @@ void wxComboCtrlBase::ShowPopup()
  
      int rightX = scrPos.x + ctrlSz.x + m_extRight - szp.x;
      int leftX = scrPos.x - m_extLeft;
  
      int rightX = scrPos.x + ctrlSz.x + m_extRight - szp.x;
      int leftX = scrPos.x - m_extLeft;
+
+    if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
+        leftX -= ctrlSz.x;
+
      int screenWidth = wxSystemSettings::GetMetric( wxSYS_SCREEN_X );
  
      // If there is not enough horizontal space, anchor on the other side.
      int screenWidth = wxSystemSettings::GetMetric( wxSYS_SCREEN_X );
  
      // If there is not enough horizontal space, anchor on the other side.
@@ -1690,22 +2347,27 @@ void wxComboCtrlBase::ShowPopup()
      else
          popupX = 0;
  
      else
          popupX = 0;
  
+    int showFlags = CanDeferShow;
+
      if ( spaceBelow < szp.y )
      {
          popupY = scrPos.y - szp.y;
      if ( spaceBelow < szp.y )
      {
          popupY = scrPos.y - szp.y;
+        showFlags |= ShowAbove;
      }
  
      }
  
-    // Move to position
-    //wxLogDebug(wxT("popup scheduled position1: %i,%i"),ptp.x,ptp.y);
-    //wxLogDebug(wxT("popup position1: %i,%i"),winPopup->GetPosition().x,winPopup->GetPosition().y);
-
-    // Some platforms (GTK) may need these two to be separate
-    winPopup->SetSize( szp.x, szp.y );
-    winPopup->Move( popupX, popupY );
-
-    //wxLogDebug(wxT("popup position2: %i,%i"),winPopup->GetPosition().x,winPopup->GetPosition().y);
+#if INSTALL_TOPLEV_HANDLER
+    // Put top level window event handler into place
+    if ( m_popupWinType == POPUPWIN_WXPOPUPWINDOW )
+    {
+        if ( !m_toplevEvtHandler )
+            m_toplevEvtHandler = new wxComboFrameEventHandler(this);
  
  
-    m_popup = popup;
+        wxWindow* toplev = ::wxGetTopLevelParent( this );
+        wxASSERT( toplev );
+        ((wxComboFrameEventHandler*)m_toplevEvtHandler)->OnPopup();
+        toplev->PushEventHandler( m_toplevEvtHandler );
+    }
+#endif
  
      // Set string selection (must be this way instead of SetStringSelection)
      if ( m_text )
  
      // Set string selection (must be this way instead of SetStringSelection)
      if ( m_text )
@@ -1722,42 +2384,82 @@ void wxComboCtrlBase::ShowPopup()
      }
  
      // This must be after SetStringValue
      }
  
      // This must be after SetStringValue
-    m_isPopupShown = true;
+    m_popupWinState = Animating;
  
  
-    // Show it
-#if USE_TRANSIENT_POPUP
-    ((wxPopupTransientWindow*)winPopup)->Popup(popup);
-#else
-    winPopup->Show();
-#endif
+    wxRect popupWinRect( popupX, popupY, szp.x, szp.y );
  
  
-#if INSTALL_TOPLEV_HANDLER
-    // Put top level window event handler into place
-    if ( !m_toplevEvtHandler )
-        m_toplevEvtHandler = new wxComboFrameEventHandler(this);
+    m_popup = popup;
+    if ( (m_iFlags & wxCC_IFLAG_DISABLE_POPUP_ANIM) ||
+         AnimateShow( popupWinRect, showFlags ) )
+    {
+        DoShowPopup( popupWinRect, showFlags );
+    }
+}
  
  
-    wxWindow* toplev = ::wxGetTopLevelParent( this );
-    wxASSERT( toplev );
-    ((wxComboFrameEventHandler*)m_toplevEvtHandler)->OnPopup();
-    toplev->PushEventHandler( m_toplevEvtHandler );
+bool wxComboCtrlBase::AnimateShow( const wxRect& WXUNUSED(rect), int WXUNUSED(flags) )
+{
+    return true;
+}
+
+void wxComboCtrlBase::DoShowPopup( const wxRect& rect, int WXUNUSED(flags) )
+{
+    wxWindow* winPopup = m_winPopup;
+
+    if ( IsPopupWindowState(Animating) )
+    {
+        // Make sure the popup window is shown in the right position.
+        // Should not matter even if animation already did this.
+
+        // Some platforms (GTK) may like SetSize and Move to be separate
+        // (though the bug was probably fixed).
+        winPopup->SetSize( rect );
+
+#if USES_WXPOPUPTRANSIENTWINDOW
+        if ( m_popupWinType == POPUPWIN_WXPOPUPTRANSIENTWINDOW )
+            ((wxPopupTransientWindow*)winPopup)->Popup(m_popup);
+        else
  #endif
  #endif
+            winPopup->Show();
+
+        m_popupWinState = Visible;
+
+        // If popup window was a generic top-level window, or the
+        // wxPopupWindow implemenation on this platform is classified as
+        // perfect, then we should be able to safely set focus to the popup
+        // control.
+        if ( IsPopupWinTypePerfect(m_popupWinType) )
+            m_popup->SetFocus();
+    }
+    else if ( IsPopupWindowState(Hidden) )
+    {
+        // Animation was aborted
  
  
+        wxASSERT( !winPopup->IsShown() );
+
+        m_popupWinState = Hidden;
+    }
+
+    Refresh();
  }
  
  }
  
-void wxComboCtrlBase::OnPopupDismiss()
+void wxComboCtrlBase::OnPopupDismiss(bool generateEvent)
  {
      // Just in case, avoid double dismiss
  {
      // Just in case, avoid double dismiss
-    if ( !m_isPopupShown )
+    if ( IsPopupWindowState(Hidden) )
          return;
  
          return;
  
-    // *Must* set this before focus etc.
-    m_isPopupShown = false;
+    // This must be set before focus - otherwise there will be recursive
+    // OnPopupDismisses.
+    m_popupWinState = Hidden;
+
+    //SetFocus();
+    m_winPopup->Disable();
  
      // Inform popup control itself
      m_popupInterface->OnDismiss();
  
  
      // Inform popup control itself
      m_popupInterface->OnDismiss();
  
-    if ( m_popupExtraHandler )
-        ((wxComboPopupExtraEventHandler*)m_popupExtraHandler)->OnPopupDismiss();
+    if ( m_popupEvtHandler )
+        ((wxComboPopupEvtHandler*)m_popupEvtHandler)->OnPopupDismiss();
  
  #if INSTALL_TOPLEV_HANDLER
      // Remove top level window event handler
  
  #if INSTALL_TOPLEV_HANDLER
      // Remove top level window event handler
@@ -1769,7 +2471,10 @@ void wxComboCtrlBase::OnPopupDismiss()
      }
  #endif
  
      }
  #endif
  
-    m_timeCanAcceptClick = ::wxGetLocalTimeMillis() + 150;
+    m_timeCanAcceptClick = ::wxGetLocalTimeMillis();
+
+    if ( m_popupWinType == POPUPWIN_WXPOPUPTRANSIENTWINDOW )
+        m_timeCanAcceptClick += 150;
  
      // If cursor not on dropdown button, then clear its state
      // (technically not required by all ports, but do it for all just in case)
  
      // If cursor not on dropdown button, then clear its state
      // (technically not required by all ports, but do it for all just in case)
@@ -1788,29 +2493,29 @@ void wxComboCtrlBase::OnPopupDismiss()
      // refresh control (necessary even if m_text)
      Refresh();
  
      // refresh control (necessary even if m_text)
      Refresh();
  
-#if !wxUSE_POPUPWIN
      SetFocus();
      SetFocus();
-#endif
  
  
+    if ( generateEvent )
+    {
+        wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_CLOSEUP, GetId());
+        event.SetEventObject(this);
+        HandleWindowEvent(event);
+    }
  }
  
  }
  
-void wxComboCtrlBase::HidePopup()
+void wxComboCtrlBase::HidePopup(bool generateEvent)
  {
      // Should be able to call this without popup interface
  {
      // Should be able to call this without popup interface
-    //wxCHECK_RET( m_popupInterface, _T("no popup interface") );
-    if ( !m_isPopupShown )
+    if ( IsPopupWindowState(Hidden) )
          return;
  
      // transfer value and show it in textctrl, if any
          return;
  
      // transfer value and show it in textctrl, if any
-    SetValue( m_popupInterface->GetStringValue() );
+    if ( !IsPopupWindowState(Animating) )
+        SetValueByUser( m_popupInterface->GetStringValue() );
  
  
-#if USE_TRANSIENT_POPUP
-    ((wxPopupTransientWindow*)m_winPopup)->Dismiss();
-#else
      m_winPopup->Hide();
      m_winPopup->Hide();
-#endif
  
  
-    OnPopupDismiss();
+    OnPopupDismiss(generateEvent);
  }
  
  // ----------------------------------------------------------------------------
  }
  
  // ----------------------------------------------------------------------------
@@ -1825,6 +2530,9 @@ void wxComboCtrlBase::SetButtonPosition( int width, int height,
      m_btnSide = side;
      m_btnSpacingX = spacingX;
  
      m_btnSide = side;
      m_btnSpacingX = spacingX;
  
+    if ( width > 0 || height > 0 || spacingX )
+        m_iFlags |= wxCC_IFLAG_HAS_NONSTANDARD_BUTTON;
+
      RecalcAndRefresh();
  }
  
      RecalcAndRefresh();
  }
  
@@ -1856,17 +2564,17 @@ void wxComboCtrlBase::SetButtonBitmaps( const wxBitmap& bmpNormal,
      m_bmpNormal = bmpNormal;
      m_blankButtonBg = blankButtonBg;
  
      m_bmpNormal = bmpNormal;
      m_blankButtonBg = blankButtonBg;
  
-    if ( bmpPressed.Ok() )
+    if ( bmpPressed.IsOk() )
          m_bmpPressed = bmpPressed;
      else
          m_bmpPressed = bmpNormal;
  
          m_bmpPressed = bmpPressed;
      else
          m_bmpPressed = bmpNormal;
  
-    if ( bmpHover.Ok() )
+    if ( bmpHover.IsOk() )
          m_bmpHover = bmpHover;
      else
          m_bmpHover = bmpNormal;
  
          m_bmpHover = bmpHover;
      else
          m_bmpHover = bmpNormal;
  
-    if ( bmpDisabled.Ok() )
+    if ( bmpDisabled.IsOk() )
          m_bmpDisabled = bmpDisabled;
      else
          m_bmpDisabled = bmpNormal;
          m_bmpDisabled = bmpDisabled;
      else
          m_bmpDisabled = bmpNormal;
@@ -1891,65 +2599,139 @@ void wxComboCtrlBase::SetCustomPaintWidth( int width )
      RecalcAndRefresh();
  }
  
      RecalcAndRefresh();
  }
  
+bool wxComboCtrlBase::DoSetMargins(const wxPoint& margins)
+{
+    // For general sanity's sake, we ignore top margin. Instead
+    // we will always try to center the text vertically.
+    bool res = true;
+
+    if ( margins.x != -1 )
+    {
+        m_marginLeft = margins.x;
+        m_iFlags |= wxCC_IFLAG_LEFT_MARGIN_SET;
+    }
+    else
+    {
+        m_marginLeft = GetNativeTextIndent();
+        m_iFlags &= ~(wxCC_IFLAG_LEFT_MARGIN_SET);
+    }
+
+    if ( margins.y != -1 )
+    {
+        res = false;
+    }
+
+    RecalcAndRefresh();
+
+    return res;
+}
+
+wxPoint wxComboCtrlBase::DoGetMargins() const
+{
+    return wxPoint(m_marginLeft, -1);
+}
+
+#if WXWIN_COMPATIBILITY_2_8
  void wxComboCtrlBase::SetTextIndent( int indent )
  {
      if ( indent < 0 )
      {
  void wxComboCtrlBase::SetTextIndent( int indent )
  {
      if ( indent < 0 )
      {
-        m_absIndent = GetNativeTextIndent();
-        m_iFlags &= ~(wxCC_IFLAG_INDENT_SET);
+        m_marginLeft = GetNativeTextIndent();
+        m_iFlags &= ~(wxCC_IFLAG_LEFT_MARGIN_SET);
      }
      else
      {
      }
      else
      {
-        m_absIndent = indent;
-        m_iFlags |= wxCC_IFLAG_INDENT_SET;
+        m_marginLeft = indent;
+        m_iFlags |= wxCC_IFLAG_LEFT_MARGIN_SET;
      }
  
      RecalcAndRefresh();
  }
  
      }
  
      RecalcAndRefresh();
  }
  
+wxCoord wxComboCtrlBase::GetTextIndent() const
+{
+    return m_marginLeft;
+}
+#endif
+
  wxCoord wxComboCtrlBase::GetNativeTextIndent() const
  {
      return DEFAULT_TEXT_INDENT;
  }
  
  wxCoord wxComboCtrlBase::GetNativeTextIndent() const
  {
      return DEFAULT_TEXT_INDENT;
  }
  
+void wxComboCtrlBase::SetTextCtrlStyle( int style )
+{
+    m_textCtrlStyle = style;
+
+    if ( m_text )
+        m_text->SetWindowStyle(style);
+}
+
  // ----------------------------------------------------------------------------
  // ----------------------------------------------------------------------------
-// methods forwarded to wxTextCtrl
+// wxTextEntry interface
  // ----------------------------------------------------------------------------
  
  // ----------------------------------------------------------------------------
  
-wxString wxComboCtrlBase::GetValue() const
+wxString wxComboCtrlBase::DoGetValue() const
  {
      if ( m_text )
          return m_text->GetValue();
      return m_valueString;
  }
  
  {
      if ( m_text )
          return m_text->GetValue();
      return m_valueString;
  }
  
-void wxComboCtrlBase::SetValueWithEvent(const wxString& value, bool withEvent)
+void wxComboCtrlBase::SetValueWithEvent(const wxString& value,
+                                        bool withEvent)
  {
  {
-    if ( m_text )
-    {
-        if ( !withEvent )
-            m_ignoreEvtText++;
-
-        m_text->SetValue(value);
-        if ( !(m_iFlags & wxCC_NO_TEXT_AUTO_SELECT) )
-            m_text->SelectAll();
-    }
-
-    m_valueString = value;
+    DoSetValue(value, withEvent ? SetValue_SendEvent : 0);
+}
  
  
-    Refresh();
+void wxComboCtrlBase::OnSetValue(const wxString& value)
+{
+    // Note: before wxComboCtrl inherited from wxTextEntry,
+    //       this code used to be in SetValueWithEvent().
  
      // Since wxComboPopup may want to paint the combo as well, we need
      // to set the string value here (as well as sometimes in ShowPopup).
  
      // Since wxComboPopup may want to paint the combo as well, we need
      // to set the string value here (as well as sometimes in ShowPopup).
-    if ( m_valueString != value && m_popupInterface )
+    if ( m_valueString != value )
      {
      {
-        m_popupInterface->SetStringValue(value);
+        bool found = true;
+        wxString trueValue = value;
+
+        // Conform to wxComboBox behaviour: read-only control can only accept
+        // valid list items and empty string
+        if ( m_popupInterface && HasFlag(wxCB_READONLY) && value.length() )
+        {
+            found = m_popupInterface->FindItem(value,
+                                               &trueValue);
+        }
+
+        if ( found )
+        {
+            m_valueString = trueValue;
+
+            EnsurePopupControl();
+
+            if ( m_popupInterface )
+                m_popupInterface->SetStringValue(trueValue);
+        }
      }
      }
+
+    Refresh();
  }
  
  }
  
-void wxComboCtrlBase::SetValue(const wxString& value)
+void wxComboCtrlBase::SetValueByUser(const wxString& value)
  {
  {
-    SetValueWithEvent(value, false);
+    // NB: Order of function calls is important here. Otherwise
+    //     the SelectAll() may not work.
+
+    if ( m_text )
+    {
+        m_text->SetValue(value);
+
+        if ( !(m_iFlags & wxCC_NO_TEXT_AUTO_SELECT) )
+            m_text->SelectAll();
+    }
+
+    OnSetValue(value);
  }
  
  // In this SetValue variant wxComboPopup::SetStringValue is not called
  }
  
  // In this SetValue variant wxComboPopup::SetStringValue is not called
@@ -1994,12 +2776,6 @@ void wxComboCtrlBase::SetInsertionPoint(long pos)
          m_text->SetInsertionPoint(pos);
  }
  
          m_text->SetInsertionPoint(pos);
  }
  
-void wxComboCtrlBase::SetInsertionPointEnd()
-{
-    if ( m_text )
-        m_text->SetInsertionPointEnd();
-}
-
  long wxComboCtrlBase::GetInsertionPoint() const
  {
      if ( m_text )
  long wxComboCtrlBase::GetInsertionPoint() const
  {
      if ( m_text )
@@ -2016,16 +2792,48 @@ long wxComboCtrlBase::GetLastPosition() const
      return 0;
  }
  
      return 0;
  }
  
+void wxComboCtrlBase::WriteText(const wxString& text)
+{
+    if ( m_text )
+    {
+        m_text->WriteText(text);
+        OnSetValue(m_text->GetValue());
+    }
+    else
+    {
+        OnSetValue(text);
+    }
+}
+
+void wxComboCtrlBase::DoSetValue(const wxString& value, int flags)
+{
+    if ( m_text )
+    {
+        if ( flags & SetValue_SendEvent )
+            m_text->SetValue(value);
+        else
+            m_text->ChangeValue(value);
+    }
+
+    OnSetValue(value);
+}
+
  void wxComboCtrlBase::Replace(long from, long to, const wxString& value)
  {
      if ( m_text )
  void wxComboCtrlBase::Replace(long from, long to, const wxString& value)
  {
      if ( m_text )
+    {
          m_text->Replace(from, to, value);
          m_text->Replace(from, to, value);
+        OnSetValue(m_text->GetValue());
+    }
  }
  
  void wxComboCtrlBase::Remove(long from, long to)
  {
      if ( m_text )
  }
  
  void wxComboCtrlBase::Remove(long from, long to)
  {
      if ( m_text )
+    {
          m_text->Remove(from, to);
          m_text->Remove(from, to);
+        OnSetValue(m_text->GetValue());
+    }
  }
  
  void wxComboCtrlBase::SetSelection(long from, long to)
  }
  
  void wxComboCtrlBase::SetSelection(long from, long to)
@@ -2034,10 +2842,73 @@ void wxComboCtrlBase::SetSelection(long from, long to)
          m_text->SetSelection(from, to);
  }
  
          m_text->SetSelection(from, to);
  }
  
+void wxComboCtrlBase::GetSelection(long *from, long *to) const
+{
+    if ( m_text )
+    {
+        m_text->GetSelection(from, to);
+    }
+    else
+    {
+        *from = 0;
+        *to = 0;
+    }
+}
+
+bool wxComboCtrlBase::IsEditable() const
+{
+    if ( m_text )
+        return m_text->IsEditable();
+    return false;
+}
+
+void wxComboCtrlBase::SetEditable(bool editable)
+{
+    if ( m_text )
+        m_text->SetEditable(editable);
+}
+
  void wxComboCtrlBase::Undo()
  {
      if ( m_text )
          m_text->Undo();
  }
  
  void wxComboCtrlBase::Undo()
  {
      if ( m_text )
          m_text->Undo();
  }
  
+void wxComboCtrlBase::Redo()
+{
+    if ( m_text )
+        m_text->Redo();
+}
+
+bool wxComboCtrlBase::CanUndo() const
+{
+    if ( m_text )
+        return m_text->CanUndo();
+
+    return false;
+}
+
+bool wxComboCtrlBase::CanRedo() const
+{
+    if ( m_text )
+        return m_text->CanRedo();
+
+    return false;
+}
+
+bool wxComboCtrlBase::SetHint(const wxString& hint)
+{
+    m_hintText = hint;
+    bool res = true;
+    if ( m_text )
+        res = m_text->SetHint(hint);
+    Refresh();
+    return res;
+}
+
+wxString wxComboCtrlBase::GetHint() const
+{
+    return m_hintText;
+}
+
  #endif // wxUSE_COMBOCTRL
  #endif // wxUSE_COMBOCTRL