work around probable bug in GTK+ 2.18 when calling WriteText on a new, empty control...

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

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index c7baa0359ce37bf8b3ff19df32e861ff0f200555..592c23a9bc2252bef135cfe23243e2d5247e351f 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -40,7 +40,7 @@
 
 #include "wx/msw/private.h"
 #include "wx/evtloop.h"
 
 #include "wx/msw/private.h"
 #include "wx/evtloop.h"

-#include "wx/ptr_scpd.h"
+#include "wx/scopedptr.h"

 
 #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
     #include "wx/msw/wince/resources.h"
 
 #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
     #include "wx/msw/wince/resources.h"


@@ -150,7 +150,9 @@ void wxDialog::Init()
 #if wxUSE_TOOLBAR && defined(__POCKETPC__)
     m_dialogToolBar = NULL;
 #endif
 #if wxUSE_TOOLBAR && defined(__POCKETPC__)
     m_dialogToolBar = NULL;
 #endif

+#if wxUSE_DIALOG_SIZEGRIP

     m_hGripper = 0;
     m_hGripper = 0;

+#endif // wxUSE_DIALOG_SIZEGRIP

 }
 
 bool wxDialog::Create(wxWindow *parent,
 }
 
 bool wxDialog::Create(wxWindow *parent,


@@ -179,6 +181,7 @@ bool wxDialog::Create(wxWindow *parent,
     CreateToolBar();
 #endif
 
     CreateToolBar();
 #endif
 

+#if wxUSE_DIALOG_SIZEGRIP

     if ( HasFlag(wxRESIZE_BORDER) )
     {
         CreateGripper();
     if ( HasFlag(wxRESIZE_BORDER) )
     {
         CreateGripper();


@@ -186,46 +189,25 @@ bool wxDialog::Create(wxWindow *parent,
         Connect(wxEVT_CREATE,
                 wxWindowCreateEventHandler(wxDialog::OnWindowCreate));
     }
         Connect(wxEVT_CREATE,
                 wxWindowCreateEventHandler(wxDialog::OnWindowCreate));
     }

+#endif // wxUSE_DIALOG_SIZEGRIP

 
     return true;
 }
 
 wxDialog::~wxDialog()
 {
 
     return true;
 }
 
 wxDialog::~wxDialog()
 {

-    m_isBeingDeleted = true;
-

     // this will also reenable all the other windows for a modal dialog
     Show(false);
 
     // this will also reenable all the other windows for a modal dialog
     Show(false);
 

+#if wxUSE_DIALOG_SIZEGRIP

     DestroyGripper();
     DestroyGripper();

+#endif // wxUSE_DIALOG_SIZEGRIP

 }
 
 // ----------------------------------------------------------------------------
 // showing the dialogs
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // showing the dialogs
 // ----------------------------------------------------------------------------
 

-wxWindow *wxDialog::FindSuitableParent() const
-{
-    // first try to use the currently active window
-    HWND hwndFg = ::GetForegroundWindow();
-    wxWindow *parent = hwndFg ? wxFindWinFromHandle((WXHWND)hwndFg)
-                              : NULL;
-    if ( !parent )
-    {
-        // next try the main app window
-        parent = wxTheApp->GetTopWindow();
-    }
-
-    // finally, check if the parent we found is really suitable
-    if ( !parent || parent == (wxWindow *)this || !parent->IsShown() )
-    {
-        // don't use this one
-        parent = NULL;
-    }
-
-    return parent;
-}
-

 bool wxDialog::Show(bool show)
 {
     if ( show == IsShown() )
 bool wxDialog::Show(bool show)
 {
     if ( show == IsShown() )


@@ -278,7 +260,7 @@ void wxDialog::Raise()
 // show dialog modally
 int wxDialog::ShowModal()
 {
 // show dialog modally
 int wxDialog::ShowModal()
 {

-    wxASSERT_MSG( !IsModal(), _T("ShowModal() can't be called twice") );
+    wxASSERT_MSG( !IsModal(), wxT("ShowModal() can't be called twice") );

 
     Show();
 
 
     Show();
 


@@ -297,7 +279,7 @@ int wxDialog::ShowModal()
 
 void wxDialog::EndModal(int retCode)
 {
 
 void wxDialog::EndModal(int retCode)
 {

-    wxASSERT_MSG( IsModal(), _T("EndModal() called for non modal dialog") );
+    wxASSERT_MSG( IsModal(), wxT("EndModal() called for non modal dialog") );

 
     SetReturnCode(retCode);
 
 
     SetReturnCode(retCode);
 


@@ -308,6 +290,8 @@ void wxDialog::EndModal(int retCode)
 // wxDialog gripper handling
 // ----------------------------------------------------------------------------
 
 // wxDialog gripper handling
 // ----------------------------------------------------------------------------
 

+#if wxUSE_DIALOG_SIZEGRIP
+

 void wxDialog::SetWindowStyleFlag(long style)
 {
     wxDialogBase::SetWindowStyleFlag(style);
 void wxDialog::SetWindowStyleFlag(long style)
 {
     wxDialogBase::SetWindowStyleFlag(style);


@@ -352,7 +336,7 @@ void wxDialog::DestroyGripper()
         // have been called yet)
         wxASSERT_MSG( !IsShown() ||
                       ::GetWindow((HWND)m_hGripper, GW_HWNDNEXT) == 0,
         // have been called yet)
         wxASSERT_MSG( !IsShown() ||
                       ::GetWindow((HWND)m_hGripper, GW_HWNDNEXT) == 0,

-            _T("Bug in wxWidgets: gripper should be at the bottom of Z-order") );
+            wxT("Bug in wxWidgets: gripper should be at the bottom of Z-order") );

         ::DestroyWindow((HWND) m_hGripper);
         m_hGripper = 0;
     }
         ::DestroyWindow((HWND) m_hGripper);
         m_hGripper = 0;
     }


@@ -360,7 +344,7 @@ void wxDialog::DestroyGripper()
 
 void wxDialog::ShowGripper(bool show)
 {
 
 void wxDialog::ShowGripper(bool show)
 {

-    wxASSERT_MSG( m_hGripper, _T("shouldn't be called if we have no gripper") );
+    wxASSERT_MSG( m_hGripper, wxT("shouldn't be called if we have no gripper") );

 
     if ( show )
         ResizeGripper();
 
     if ( show )
         ResizeGripper();


@@ -370,7 +354,7 @@ void wxDialog::ShowGripper(bool show)
 
 void wxDialog::ResizeGripper()
 {
 
 void wxDialog::ResizeGripper()
 {

-    wxASSERT_MSG( m_hGripper, _T("shouldn't be called if we have no gripper") );
+    wxASSERT_MSG( m_hGripper, wxT("shouldn't be called if we have no gripper") );

 
     HWND hwndGripper = (HWND)m_hGripper;
 
 
     HWND hwndGripper = (HWND)m_hGripper;
 


@@ -396,6 +380,8 @@ void wxDialog::OnWindowCreate(wxWindowCreateEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 

+#endif // wxUSE_DIALOG_SIZEGRIP
+

 // ----------------------------------------------------------------------------
 // wxWin event handlers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWin event handlers
 // ----------------------------------------------------------------------------


@@ -477,6 +463,7 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
             break;
 
         case WM_SIZE:
             break;
 
         case WM_SIZE:

+#if wxUSE_DIALOG_SIZEGRIP

             if ( m_hGripper )
             {
                 switch ( wParam )
             if ( m_hGripper )
             {
                 switch ( wParam )


@@ -489,6 +476,7 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
                         ShowGripper(true);
                 }
             }
                         ShowGripper(true);
                 }
             }

+#endif // wxUSE_DIALOG_SIZEGRIP

 
             // the Windows dialogs unfortunately are not meant to be resizeable
             // at all and their standard class doesn't include CS_[VH]REDRAW
 
             // the Windows dialogs unfortunately are not meant to be resizeable
             // at all and their standard class doesn't include CS_[VH]REDRAW