Don't set the initial size as minimal size for top level windows.

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

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 65066b56c7a7b3b48223d2dbc4b2ece4c4b64bf0..fafd36425e7815fe16df95b901f1e4d8be1c4d29 100644 (file)
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -32,7 +32,6 @@
     #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/textctrl.h"
 #endif
     #include "wx/timer.h"
     #include "wx/textctrl.h"
 #endif


@@ -59,6 +58,11 @@
 
 #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 TRANSIENT_POPUPWIN_IS_PERFECT 0 // wxPopupTransientWindow works, its child can have focus, and common
                                         // native controls work on it like normal.
 #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.


@@ -71,14 +75,18 @@
 
 #elif defined(__WXGTK__)
 
 
 #elif defined(__WXGTK__)
 

-#include "wx/gtk/private.h"
-

 // 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).
 
 // 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
+
+#include "wx/gtk/private.h"
+

 // NB: Let's not be afraid to use wxGTK's wxPopupTransientWindow as a
 //     'perfect' popup, as it can succesfully host child controls even in
 //     popups that are shown in modal dialogs.
 // NB: Let's not be afraid to use wxGTK's wxPopupTransientWindow as a
 //     'perfect' popup, as it can succesfully host child controls even in
 //     popups that are shown in modal dialogs.


@@ -92,6 +100,10 @@
 
 #elif defined(__WXMAC__)
 
 
 #elif defined(__WXMAC__)
 

+#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 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.


@@ -106,6 +118,10 @@
 
 #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 TRANSIENT_POPUPWIN_IS_PERFECT 0 // wxPopupTransientWindow works, its child can have focus, and common
                                         // native controls work on it like normal.
 #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.


@@ -139,7 +155,7 @@ enum
     POPUPWIN_NONE                   = 0,
     POPUPWIN_WXPOPUPTRANSIENTWINDOW = 1,
     POPUPWIN_WXPOPUPWINDOW          = 2,
     POPUPWIN_NONE                   = 0,
     POPUPWIN_WXPOPUPTRANSIENTWINDOW = 1,
     POPUPWIN_WXPOPUPWINDOW          = 2,

-    POPUPWIN_WXDIALOG               = 3
+    POPUPWIN_GENERICTLW             = 3

 };
 
 
 };
 
 


@@ -157,9 +173,9 @@ enum
         #define SECONDARY_POPUP_TYPE        POPUPWIN_WXPOPUPWINDOW
         #define USES_WXPOPUPWINDOW          1
     #else
         #define SECONDARY_POPUP_TYPE        POPUPWIN_WXPOPUPWINDOW
         #define USES_WXPOPUPWINDOW          1
     #else

-        #define wxComboPopupWindowBase2     wxDialog
-        #define SECONDARY_POPUP_TYPE        POPUPWIN_WXDIALOG
-        #define USES_WXDIALOG               1
+        #define wxComboPopupWindowBase2     wxComboCtrlGenericTLW
+        #define SECONDARY_POPUP_TYPE        POPUPWIN_GENERICTLW
+        #define USES_GENERICTLW             1

     #endif
 
 #elif wxUSE_POPUPWIN
     #endif
 
 #elif wxUSE_POPUPWIN


@@ -170,17 +186,17 @@ enum
     #define USES_WXPOPUPWINDOW          1
 
     #if !POPUPWIN_IS_PERFECT
     #define USES_WXPOPUPWINDOW          1
 
     #if !POPUPWIN_IS_PERFECT

-        #define wxComboPopupWindowBase2     wxDialog
-        #define SECONDARY_POPUP_TYPE        POPUPWIN_WXDIALOG
-        #define USES_WXDIALOG               1
+        #define wxComboPopupWindowBase2     wxComboCtrlGenericTLW
+        #define SECONDARY_POPUP_TYPE        POPUPWIN_GENERICTLW
+        #define USES_GENERICTLW             1

     #endif
 
 #else
     // wxPopupWindow is not implemented
 
     #endif
 
 #else
     // wxPopupWindow is not implemented
 

-    #define wxComboPopupWindowBase      wxDialog
-    #define PRIMARY_POPUP_TYPE          POPUPWIN_WXDIALOG
-    #define USES_WXDIALOG               1
+    #define wxComboPopupWindowBase      wxComboCtrlGenericTLW
+    #define PRIMARY_POPUP_TYPE          POPUPWIN_GENERICTLW
+    #define USES_GENERICTLW             1

 
 #endif
 
 
 #endif
 


@@ -193,8 +209,8 @@ enum
     #define USES_WXPOPUPWINDOW          0
 #endif
 
     #define USES_WXPOPUPWINDOW          0
 #endif
 

-#ifndef USES_WXDIALOG
-    #define USES_WXDIALOG               0
+#ifndef USES_GENERICTLW
+    #define USES_GENERICTLW             0

 #endif
 
 
 #endif
 
 


@@ -291,7 +307,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();


@@ -299,37 +315,37 @@ 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();
 }
 
     event.Skip();
 }
 


@@ -413,7 +429,7 @@ void wxComboPopupWindow::OnDismiss()
     wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxComboCtrlBase)),
                   wxT("parent might not be wxComboCtrl, but check IMPLEMENT_DYNAMIC_CLASS(2) macro for correctness") );
 
     wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxComboCtrlBase)),
                   wxT("parent might not be wxComboCtrl, but check IMPLEMENT_DYNAMIC_CLASS(2) macro for correctness") );
 

-    combo->OnPopupDismiss();
+    combo->OnPopupDismiss(true);

 }
 #endif // USES_WXPOPUPTRANSIENTWINDOW
 
 }
 #endif // USES_WXPOPUPTRANSIENTWINDOW
 


@@ -435,7 +451,7 @@ public:
 
     void OnSizeEvent( wxSizeEvent& event );
     void OnKeyEvent(wxKeyEvent& event);
 
     void OnSizeEvent( wxSizeEvent& event );
     void OnKeyEvent(wxKeyEvent& event);

-#if USES_WXDIALOG
+#if USES_GENERICTLW

     void OnActivate( wxActivateEvent& event );
 #endif
 
     void OnActivate( wxActivateEvent& event );
 #endif
 


@@ -449,7 +465,7 @@ private:
 BEGIN_EVENT_TABLE(wxComboPopupWindowEvtHandler, wxEvtHandler)
     EVT_KEY_DOWN(wxComboPopupWindowEvtHandler::OnKeyEvent)
     EVT_KEY_UP(wxComboPopupWindowEvtHandler::OnKeyEvent)
 BEGIN_EVENT_TABLE(wxComboPopupWindowEvtHandler, wxEvtHandler)
     EVT_KEY_DOWN(wxComboPopupWindowEvtHandler::OnKeyEvent)
     EVT_KEY_UP(wxComboPopupWindowEvtHandler::OnKeyEvent)

-#if USES_WXDIALOG
+#if USES_GENERICTLW

     EVT_ACTIVATE(wxComboPopupWindowEvtHandler::OnActivate)
 #endif
     EVT_SIZE(wxComboPopupWindowEvtHandler::OnSizeEvent)
     EVT_ACTIVATE(wxComboPopupWindowEvtHandler::OnActivate)
 #endif
     EVT_SIZE(wxComboPopupWindowEvtHandler::OnSizeEvent)


@@ -470,13 +486,13 @@ void wxComboPopupWindowEvtHandler::OnKeyEvent( wxKeyEvent& event )
     child->GetEventHandler()->AddPendingEvent(event);
 }
 
     child->GetEventHandler()->AddPendingEvent(event);
 }
 

-#if USES_WXDIALOG
+#if USES_GENERICTLW

 void wxComboPopupWindowEvtHandler::OnActivate( wxActivateEvent& event )
 {
     if ( !event.GetActive() )
     {
         // Tell combo control that we are dismissed.
 void wxComboPopupWindowEvtHandler::OnActivate( wxActivateEvent& event )
 {
     if ( !event.GetActive() )
     {
         // Tell combo control that we are dismissed.

-        m_combo->HidePopup();
+        m_combo->HidePopup(true);

 
         event.Skip();
     }
 
         event.Skip();
     }


@@ -551,7 +567,7 @@ bool wxComboPopup::LazyCreate()
 
 void wxComboPopup::Dismiss()
 {
 
 void wxComboPopup::Dismiss()
 {

-    m_combo->HidePopup();
+    m_combo->HidePopup(true);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1618,13 +1634,13 @@ bool wxComboCtrlBase::PreprocessMouseEvent( wxMouseEvent& event,
     wxLongLong t = ::wxGetLocalTimeMillis();
     int evtType = event.GetEventType();
 
     wxLongLong t = ::wxGetLocalTimeMillis();
     int evtType = event.GetEventType();
 

-#if USES_WXPOPUPWINDOW || USES_WXDIALOG
+#if USES_WXPOPUPWINDOW || USES_GENERICTLW

     if ( m_popupWinType != POPUPWIN_WXPOPUPTRANSIENTWINDOW )
     {
         if ( IsPopupWindowState(Visible) &&
              ( evtType == wxEVT_LEFT_DOWN || evtType == wxEVT_RIGHT_DOWN ) )
         {
     if ( m_popupWinType != POPUPWIN_WXPOPUPTRANSIENTWINDOW )
     {
         if ( IsPopupWindowState(Visible) &&
              ( evtType == wxEVT_LEFT_DOWN || evtType == wxEVT_RIGHT_DOWN ) )
         {

-            HidePopup();
+            HidePopup(true);

             return true;
         }
     }
             return true;
         }
     }


@@ -1652,7 +1668,7 @@ void wxComboCtrlBase::HandleNormalMouseEvent( wxMouseEvent& event )
     #if USES_WXPOPUPWINDOW
             // Click here always hides the popup.
             if ( m_popupWinType == POPUPWIN_WXPOPUPWINDOW )
     #if USES_WXPOPUPWINDOW
             // Click here always hides the popup.
             if ( m_popupWinType == POPUPWIN_WXPOPUPWINDOW )

-                HidePopup();
+                HidePopup(true);

     #endif
         }
         else
     #endif
         }
         else


@@ -1772,12 +1788,23 @@ void wxComboCtrlBase::CreatePopup()
 #ifdef wxComboPopupWindowBase2
         if ( m_iFlags & wxCC_IFLAG_USE_ALT_POPUP )
         {
 #ifdef wxComboPopupWindowBase2
         if ( m_iFlags & wxCC_IFLAG_USE_ALT_POPUP )
         {

-        #if !USES_WXDIALOG
+        #if !USES_GENERICTLW

             m_winPopup = new wxComboPopupWindowBase2( this, wxNO_BORDER );
         #else
             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),
             m_winPopup = new wxComboPopupWindowBase2( this, wxID_ANY, wxEmptyString,
                                                       wxPoint(-21,-21), wxSize(20, 20),

-                                                      wxNO_BORDER );
+                                                      tlwFlags );
+          #endif

         #endif
             m_popupWinType = SECONDARY_POPUP_TYPE;
         }
         #endif
             m_popupWinType = SECONDARY_POPUP_TYPE;
         }


@@ -1808,7 +1835,7 @@ 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 )
         m_popup->RemoveEventHandler(m_popupExtraHandler);
 
     if ( m_popup )
         m_popup->RemoveEventHandler(m_popupExtraHandler);


@@ -1871,9 +1898,17 @@ void wxComboCtrlBase::OnButtonClick()
     // Derived classes can override this method for totally custom
     // popup action
     if ( !IsPopupWindowState(Visible) )
     // Derived classes can override this method for totally custom
     // popup action
     if ( !IsPopupWindowState(Visible) )

+    {
+        wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_DROPDOWN, GetId());
+        event.SetEventObject(this);
+        HandleWindowEvent(event);
+

         ShowPopup();
         ShowPopup();

+    }

     else
     else

-        HidePopup();
+    {
+        HidePopup(true);
+    }

 }
 
 void wxComboCtrlBase::ShowPopup()
 }
 
 void wxComboCtrlBase::ShowPopup()


@@ -2092,7 +2127,7 @@ void wxComboCtrlBase::DoShowPopup( const wxRect& rect, int WXUNUSED(flags) )
     Refresh();
 }
 
     Refresh();
 }
 

-void wxComboCtrlBase::OnPopupDismiss()
+void wxComboCtrlBase::OnPopupDismiss(bool generateEvent)

 {
     // Just in case, avoid double dismiss
     if ( IsPopupWindowState(Hidden) )
 {
     // Just in case, avoid double dismiss
     if ( IsPopupWindowState(Hidden) )


@@ -2144,9 +2179,16 @@ void wxComboCtrlBase::OnPopupDismiss()
     Refresh();
 
     SetFocus();
     Refresh();
 
     SetFocus();

+
+    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
     if ( IsPopupWindowState(Hidden) )
 {
     // Should be able to call this without popup interface
     if ( IsPopupWindowState(Hidden) )


@@ -2158,7 +2200,7 @@ void wxComboCtrlBase::HidePopup()
 
     m_winPopup->Hide();
 
 
     m_winPopup->Hide();
 

-    OnPopupDismiss();
+    OnPopupDismiss(generateEvent);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -2271,7 +2313,7 @@ wxPoint wxComboCtrlBase::DoGetMargins() const
     return wxPoint(m_marginLeft, -1);
 }
 
     return wxPoint(m_marginLeft, -1);
 }
 

-#if WXWIN_COMPATIBILITY_2_6
+#if WXWIN_COMPATIBILITY_2_8

 void wxComboCtrlBase::SetTextIndent( int indent )
 {
     if ( indent < 0 )
 void wxComboCtrlBase::SetTextIndent( int indent )
 {
     if ( indent < 0 )