Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tooltips in controls in dialogs actually work now

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-04-17 20:30:28 +00:00
parent 9a5ccab431
commit bd9d76cbe5
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/msw/dialog.cpp
View File

@@ -78,9 +78,13 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
long style, long style,
const wxString& name) const wxString& name)
{ {
#if wxUSE_TOOLTIPS
m_hwndToolTip = 0;
#endif
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
SetName(name); SetName(name);
if (!parent) if (!parent)
wxTopLevelWindows.Append(this); wxTopLevelWindows.Append(this);
@@ -144,7 +148,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
} }
SubclassWin(GetHWND()); SubclassWin(GetHWND());
SetWindowText(hwnd, title); SetWindowText(hwnd, title);
SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
@@ -158,7 +162,7 @@ void wxDialog::SetModal(bool flag)
else else
if ( m_windowStyle & wxDIALOG_MODAL ) if ( m_windowStyle & wxDIALOG_MODAL )
m_windowStyle -= wxDIALOG_MODAL ; m_windowStyle -= wxDIALOG_MODAL ;
wxModelessWindows.DeleteObject(this); wxModelessWindows.DeleteObject(this);
if (!flag) if (!flag)
wxModelessWindows.Append(this); wxModelessWindows.Append(this);
@@ -318,7 +322,7 @@ bool wxDialog::Show(bool show)
BringWindowToTop((HWND) GetHWND()); BringWindowToTop((HWND) GetHWND());
return TRUE; return TRUE;
} }
m_modalShowing = TRUE; m_modalShowing = TRUE;
wxNode *node = wxModalDialogs.First(); wxNode *node = wxModalDialogs.First();
while (node) 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. // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog.
static wxList closing; static wxList closing;
if ( closing.Member(this) ) if ( closing.Member(this) )
return; return;
closing.Append(this); closing.Append(this);
wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
cancelEvent.SetEventObject( this ); cancelEvent.SetEventObject( this );
GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog

4
src/msw/tooltip.cpp
View File

@@ -176,7 +176,7 @@ WXHWND wxToolTip::GetToolTipCtrl()
"can't create tooltip control outside a frame or a dialog" ); "can't create tooltip control outside a frame or a dialog" );
HWND hwndTT = (HWND)(frame ? frame->GetToolTipCtrl() HWND hwndTT = (HWND)(frame ? frame->GetToolTipCtrl()
: dialog->GetToolTipCtrl()); : dialog->GetToolTipCtrl());
if ( !hwndTT ) if ( !hwndTT )
{ {
hwndTT = ::CreateWindow(TOOLTIPS_CLASS, hwndTT = ::CreateWindow(TOOLTIPS_CLASS,
@@ -184,7 +184,7 @@ WXHWND wxToolTip::GetToolTipCtrl()
TTS_ALWAYSTIP, TTS_ALWAYSTIP,
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
(HWND)frame->GetHWND(), (HMENU)NULL, (HWND)parent->GetHWND(), (HMENU)NULL,
wxGetInstance(), NULL); wxGetInstance(), NULL);
if ( hwndTT ) if ( hwndTT )