Added wxCONFIG_USE_RELATIVE_PATH option to allow config files to be

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

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 6b335758d2d6df6eb17afc34a3804fea1ed1a650..199442210de7e29324c7d72b9444525abbbd64ef 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -78,9 +78,13 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
                       long style,
                       const wxString& name)
 {
+#if wxUSE_TOOLTIPS
+    m_hwndToolTip = 0;
+#endif
+
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
     SetName(name);
-    
+
     if (!parent)
         wxTopLevelWindows.Append(this);
 
@@ -138,13 +142,13 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
 
     if ( !hwnd )
     {
-        wxLogError(_("Failed to created dialog."));
+        wxLogError(_("Failed to create dialog."));
 
         return FALSE;
     }
 
     SubclassWin(GetHWND());
-    
+
     SetWindowText(hwnd, title);
     SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
 
@@ -158,7 +162,7 @@ void wxDialog::SetModal(bool flag)
   else
     if ( m_windowStyle & wxDIALOG_MODAL )
         m_windowStyle -= wxDIALOG_MODAL ;
-  
+
   wxModelessWindows.DeleteObject(this);
   if (!flag)
     wxModelessWindows.Append(this);
@@ -318,7 +322,7 @@ bool wxDialog::Show(bool show)
         BringWindowToTop((HWND) GetHWND());
         return TRUE;
       }
-      
+
       m_modalShowing = TRUE;
       wxNode *node = wxModalDialogs.First();
       while (node)
@@ -581,12 +585,12 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
     // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog.
 
     static wxList closing;
-    
+
     if ( closing.Member(this) )
         return;
-    
+
     closing.Append(this);
-    
+
     wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     cancelEvent.SetEventObject( this );
     GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog
@@ -620,4 +624,4 @@ void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
   Refresh();
 #endif
-}
\ No newline at end of file
+}