projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix broken and missing DataView interface items for Phoenix
[wxWidgets.git]
/
src
/
msw
/
progdlg.cpp
diff --git
a/src/msw/progdlg.cpp
b/src/msw/progdlg.cpp
index 8191f6b08478b66554b1e4484b717b549981ceb8..50c3f5b9741c88a869d2350c90c322ec8e70a64c 100644
(file)
--- a/
src/msw/progdlg.cpp
+++ b/
src/msw/progdlg.cpp
@@
-170,7
+170,7
@@
BOOL CALLBACK DisplayCloseButton(HWND hwnd, LPARAM lParam)
{
sharedData->m_labelCancel = _("Close");
SendMessage( hwnd, WM_SETTEXT, 0,
{
sharedData->m_labelCancel = _("Close");
SendMessage( hwnd, WM_SETTEXT, 0,
-
(LPARAM) sharedData->m_labelCancel.wx_str(
) );
+
wxMSW_CONV_LPARAM(sharedData->m_labelCancel
) );
return FALSE;
}
return FALSE;
}
@@
-212,7
+212,7
@@
void PerformNotificationUpdates(HWND hwnd,
}
if ( sharedData->m_notifications & wxSPDD_TITLE_CHANGED )
}
if ( sharedData->m_notifications & wxSPDD_TITLE_CHANGED )
- ::SetWindowText( hwnd, sharedData->m_title.
wx
_str() );
+ ::SetWindowText( hwnd, sharedData->m_title.
t
_str() );
if ( sharedData->m_notifications & wxSPDD_MESSAGE_CHANGED )
{
if ( sharedData->m_notifications & wxSPDD_MESSAGE_CHANGED )
{
@@
-245,12
+245,12
@@
void PerformNotificationUpdates(HWND hwnd,
::SendMessage( hwnd,
TDM_SET_ELEMENT_TEXT,
TDE_MAIN_INSTRUCTION,
::SendMessage( hwnd,
TDM_SET_ELEMENT_TEXT,
TDE_MAIN_INSTRUCTION,
-
(LPARAM) title.wx_str(
) );
+
wxMSW_CONV_LPARAM(title
) );
::SendMessage( hwnd,
TDM_SET_ELEMENT_TEXT,
TDE_CONTENT,
::SendMessage( hwnd,
TDM_SET_ELEMENT_TEXT,
TDE_CONTENT,
-
(LPARAM) body.wx_str(
) );
+
wxMSW_CONV_LPARAM(body
) );
}
if ( sharedData->m_notifications & wxSPDD_EXPINFO_CHANGED )
}
if ( sharedData->m_notifications & wxSPDD_EXPINFO_CHANGED )
@@
-262,7
+262,7
@@
void PerformNotificationUpdates(HWND hwnd,
::SendMessage( hwnd,
TDM_SET_ELEMENT_TEXT,
TDE_EXPANDED_INFORMATION,
::SendMessage( hwnd,
TDM_SET_ELEMENT_TEXT,
TDE_EXPANDED_INFORMATION,
-
(LPARAM) expandedInformation.wx_str(
) );
+
wxMSW_CONV_LPARAM(expandedInformation
) );
}
}
}
}
@@
-806,7
+806,7
@@
void* wxProgressDialogTaskRunner::Entry()
if ( !m_sharedData.m_expandedInformation.empty() )
{
tdc.pszExpandedInformation =
if ( !m_sharedData.m_expandedInformation.empty() )
{
tdc.pszExpandedInformation =
- m_sharedData.m_expandedInformation.
wx
_str();
+ m_sharedData.m_expandedInformation.
t
_str();
}
}
}
}