Filter index wasn't being set for multiple file dialog

[wxWidgets.git] / src / msw / caret.cpp

diff --git a/src/msw/caret.cpp b/src/msw/caret.cpp
index daf68049e9be3a1a451283479536c1ad0f5d7b17..63fc43ac088e8f11c4ff5d5361e6fc172aaf182b 100644 (file)
--- a/src/msw/caret.cpp
+++ b/src/msw/caret.cpp
@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

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

     #pragma implementation "caret.h"
 #endif
 
     #pragma implementation "caret.h"
 #endif
 


@@ -35,6 +35,8 @@
 
 #include "wx/caret.h"
 
 
 #include "wx/caret.h"
 

+#if wxUSE_CARET
+

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


@@ -132,6 +134,17 @@ void wxCaret::DoShow()
     wxASSERT_MSG( GetWindow(), wxT("caret without window cannot be shown") );
     wxASSERT_MSG( IsOk(), wxT("caret of zero size cannot be shown") );
 
     wxASSERT_MSG( GetWindow(), wxT("caret without window cannot be shown") );
     wxASSERT_MSG( IsOk(), wxT("caret of zero size cannot be shown") );
 

+    // we might not have created the caret yet if we had got the focus first
+    // and the caret was shown later - so do it now if we have the focus but
+    // not the caret
+    if ( !m_hasCaret && (wxWindow::FindFocus() == GetWindow()) )
+    {
+        if ( MSWCreateCaret() )
+        {
+            DoMove();
+        }
+    }
+

     if ( m_hasCaret )
     {
         CALL_CARET_API(ShowCaret, (GetWinHwnd(GetWindow())));
     if ( m_hasCaret )
     {
         CALL_CARET_API(ShowCaret, (GetWinHwnd(GetWindow())));


@@ -158,7 +171,10 @@ void wxCaret::DoMove()
         wxASSERT_MSG( wxWindow::FindFocus() == GetWindow(),
                       wxT("how did we lose focus?") );
 
         wxASSERT_MSG( wxWindow::FindFocus() == GetWindow(),
                       wxT("how did we lose focus?") );
 

-        CALL_CARET_API(SetCaretPos, (m_x, m_y));
+        // for compatibility with the generic version, the coordinates are
+        // client ones
+        wxPoint pt = GetWindow()->GetClientAreaOrigin();
+        CALL_CARET_API(SetCaretPos, (m_x + pt.x, m_y + pt.y));

     }
     //else: we don't have caret right now, nothing to do (this does happen)
 }
     }
     //else: we don't have caret right now, nothing to do (this does happen)
 }


@@ -175,6 +191,8 @@ void wxCaret::DoSize()
         m_hasCaret = FALSE;
         CALL_CARET_API(DestroyCaret, ());
         MSWCreateCaret();
         m_hasCaret = FALSE;
         CALL_CARET_API(DestroyCaret, ());
         MSWCreateCaret();

-        DoMove();
+        OnSetFocus();

     }
 }
     }
 }

+
+#endif