X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/129c8cf3524ba45c690192cada38025a7aa544ca..974a12f86a2882b0999a441ce4ad07e0e2c4377c:/samples/combo/combo.cpp?ds=inline

diff --git a/samples/combo/combo.cpp b/samples/combo/combo.cpp
index 7d10b80345..785a104038 100644
--- a/samples/combo/combo.cpp
+++ b/samples/combo/combo.cpp
@@ -83,6 +83,11 @@ public:
     // log wxComboCtrl events
     void OnComboBoxUpdate( wxCommandEvent& event );
 
+    void OnIdle( wxIdleEvent& event );
+
+
+    wxCheckBox*     m_cbUseAnim;
+
 protected:
     wxTextCtrl*     m_logWin;
     wxLog*          m_logOld;
@@ -127,6 +132,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(ComboControl_Compare,  MyFrame::OnShowComparison)
     EVT_MENU(ComboControl_Quit,     MyFrame::OnQuit)
     EVT_MENU(ComboControl_About,    MyFrame::OnAbout)
+
+    EVT_IDLE(MyFrame::OnIdle)
 END_EVENT_TABLE()
 
 // Create a new application object: this macro will allow wxWidgets to create
@@ -486,6 +493,66 @@ BEGIN_EVENT_TABLE(TreeCtrlComboPopup, wxTreeCtrl)
     EVT_LEFT_DOWN(TreeCtrlComboPopup::OnMouseClick)
 END_EVENT_TABLE()
 
+// ----------------------------------------------------------------------------
+// wxComboCtrl with custom popup animation
+// ----------------------------------------------------------------------------
+
+class wxComboCtrlWithCustomPopupAnim : public wxComboCtrl
+{
+public:
+
+    virtual bool AnimateShow( const wxRect& rect, int WXUNUSED(flags) )
+    {
+        MyFrame* myFrame = (MyFrame*) ::wxGetTopLevelParent(this);
+
+        if ( !myFrame->m_cbUseAnim->GetValue() )
+            return true;
+
+        int width = rect.width;
+        int height = rect.height;
+        wxBitmap bitmap( width, height, -1 );
+        wxScreenDC dc;
+        wxMemoryDC memdc( bitmap );
+        memdc.Blit( 0, 0, width, height, &dc, rect.x, rect.y );
+        memdc.SelectObject(wxNullBitmap); 
+
+        wxLongLong tStart = ::wxGetLocalTimeMillis();
+        const int delay = 300;
+        const int resolution = 10;
+
+        int center_x = rect.x + (width/2);
+        int center_y = rect.y + (height/2);
+
+        double d_height = (double) height;
+
+        dc.SetPen( *wxBLACK_PEN );
+        dc.SetBrush( *wxTRANSPARENT_BRUSH );
+        for (;;)
+        {
+            wxLongLong t = ::wxGetLocalTimeMillis();
+            int pos = (int) (t-tStart).GetLo();
+            if ( pos > delay )
+                break;
+
+            int w = (((pos*256)/delay)*width)/256;
+
+            double ratio = ((double)w / (double)width);
+            int h = (int)(d_height * ratio);
+            dc.DrawRectangle( center_x - w/2, center_y - h/2, w, h );
+            wxMilliSleep( resolution );
+            wxYield();
+            dc.DrawBitmap( bitmap, rect.x, rect.y );
+
+            if ( IsPopupWindowState(Hidden) )
+                return true;
+        }
+
+        return true;
+    }
+
+protected:
+};
+
 // ----------------------------------------------------------------------------
 // wxComboCtrl with entirely custom button action (opens file dialog)
 // ----------------------------------------------------------------------------
@@ -726,8 +793,11 @@ MyFrame::MyFrame(const wxString& title)
     colSizer->Add( rowSizer, 0, wxEXPAND|wxALL, 5 );
 
     rowSizer = new wxBoxSizer( wxHORIZONTAL );
-    cc = new wxComboCtrl(panel,2,wxEmptyString,
-                         wxDefaultPosition, wxDefaultSize);
+    cc = new wxComboCtrlWithCustomPopupAnim();
+    cc->Create(panel, wxID_ANY, wxEmptyString);
+
+    // Make sure we use popup that allows focusing the listview.
+    cc->UseAltPopupWindow();
 
     cc->SetPopupMinWidth(300);
 
@@ -749,6 +819,9 @@ MyFrame::MyFrame(const wxString& title)
     gcc = new wxGenericComboCtrl(panel,wxID_ANY,wxEmptyString,
                                  wxDefaultPosition, wxDefaultSize);
 
+    // Make sure we use popup that allows focusing the treectrl.
+    gcc->UseAltPopupWindow();
+
     // Set popup interface right away, otherwise some of the calls
     // below may fail
     TreeCtrlComboPopup* tcPopup = new TreeCtrlComboPopup();
@@ -817,7 +890,7 @@ MyFrame::MyFrame(const wxString& title)
     wxImage imgPressed(wxT("dropbutp.png"));
     wxImage imgHover(wxT("dropbuth.png"));
 
-    if ( imgNormal.Ok() && imgPressed.Ok() && imgHover.Ok() )
+    if ( imgNormal.IsOk() && imgPressed.IsOk() && imgHover.IsOk() )
     {
         wxBitmap bmpNormal(imgNormal);
         wxBitmap bmpPressed(imgPressed);
@@ -869,7 +942,23 @@ MyFrame::MyFrame(const wxString& title)
 
     topRowSizer->Add( colSizer, 1, wxALL, 2 );
 
-    topRowSizer->Add( m_logWin, 1, wxEXPAND|wxALL, 5 );
+    colSizer = new wxBoxSizer( wxVERTICAL );
+
+    wxStaticBoxSizer* sbSizer = new wxStaticBoxSizer( new wxStaticBox(panel,
+                                                                      wxID_ANY,
+                                                                      wxT("Options")),
+                                                      wxVERTICAL );
+
+    m_cbUseAnim = new wxCheckBox(panel, wxID_ANY, wxT("Custom popup animation for ListView wxComboCtrl"));
+    m_cbUseAnim->SetValue(true);
+    sbSizer->Add( m_cbUseAnim, 0, wxALL, 3 );
+
+    colSizer->Add( sbSizer, 0, wxEXPAND|wxALL, 3 );
+    colSizer->AddSpacer(8);
+    colSizer->Add( new wxStaticText(panel, wxID_ANY, wxT("Log Messages:")), 0, wxTOP|wxLEFT, 3 );
+    colSizer->Add( m_logWin, 1, wxEXPAND|wxALL, 3 );
+
+    topRowSizer->Add( colSizer, 1, wxEXPAND|wxALL, 2 );
     topSizer->Add( topRowSizer, 1, wxEXPAND );
 
     panel->SetSizer( topSizer );
@@ -1059,3 +1148,27 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
                  wxOK | wxICON_INFORMATION,
                  this);
 }
+
+void MyFrame::OnIdle(wxIdleEvent& event)
+{
+    // This code is useful for debugging focus problems
+    // (which are plentiful when dealing with popup windows).
+#if 0
+    static wxWindow* lastFocus = (wxWindow*) NULL;
+
+    wxWindow* curFocus = ::wxWindow::FindFocus();
+
+    if ( curFocus != lastFocus )
+    {
+        const wxChar* className = wxT("<none>");
+        if ( curFocus )
+            className = curFocus->GetClassInfo()->GetClassName();
+        lastFocus = curFocus;
+        wxLogDebug( wxT("FOCUSED: %s %X"),
+            className,
+            (unsigned int)curFocus);
+    }
+#endif
+
+    event.Skip();
+}