compilation fixes for wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
8c517ddd1a
commit
1318fabeb4
@ -175,18 +175,6 @@
|
||||
#define wxUSE_SOCKETS 0
|
||||
// Set to 1 to use socket classes
|
||||
|
||||
// these settings can't be set to 0 for now
|
||||
#define wxUSE_INTL 1
|
||||
#define wxUSE_LOG 1
|
||||
#define wxUSE_VALIDATORS 1
|
||||
#define wxUSE_ACCEL 1
|
||||
#define wxUSE_SASH 1
|
||||
#define wxUSE_TEXTDLG 1
|
||||
#define wxUSE_TOOLBAR 1
|
||||
#define wxUSE_STATUSBAR 1
|
||||
#define wxUSE_PROGRESSDLG 1
|
||||
#define wxUSE_DIRDLG 1
|
||||
|
||||
/*
|
||||
* Finer detail
|
||||
*
|
||||
@ -197,6 +185,42 @@
|
||||
// will be used to write, in a portable way,
|
||||
// float on the disk
|
||||
|
||||
// use wxFile class - required by i18n code, wxConfig and others - recommended
|
||||
#define wxUSE_FILE 1
|
||||
|
||||
// use wxTextFile class: requires wxFile, required by wxConfig
|
||||
#define wxUSE_TEXTFILE 1
|
||||
|
||||
// i18n support: _() macro, wxLocale class. Requires wxFile
|
||||
#define wxUSE_INTL 1
|
||||
|
||||
// wxLogXXX functions - highly recommended
|
||||
#define wxUSE_LOG 1
|
||||
|
||||
// wxValidator class
|
||||
#define wxUSE_VALIDATORS 1
|
||||
|
||||
// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar)
|
||||
#define wxUSE_ACCEL 1
|
||||
|
||||
// wxSashWindow class
|
||||
#define wxUSE_SASH 1
|
||||
|
||||
// text entry dialog and wxGetTextFromUser function
|
||||
#define wxUSE_TEXTDLG 1
|
||||
|
||||
// wxToolBar class
|
||||
#define wxUSE_TOOLBAR 1
|
||||
|
||||
// wxStatusBar class
|
||||
#define wxUSE_STATUSBAR 1
|
||||
|
||||
// progress dialog class for lengthy operations
|
||||
#define wxUSE_PROGRESSDLG 1
|
||||
|
||||
// wxDirDlg class for getting a directory name from user
|
||||
#define wxUSE_DIRDLG 1
|
||||
|
||||
/*
|
||||
* MS Windows/Windows NT
|
||||
*
|
||||
|
@ -42,7 +42,7 @@ static wxSize wxSplitMessage2( const wxString &message, wxWindow *parent )
|
||||
int y = 10;
|
||||
int w = 50;
|
||||
wxString line( _T("") );
|
||||
for (uint pos = 0; pos < message.Len(); pos++)
|
||||
for (size_t pos = 0; pos < message.Len(); pos++)
|
||||
{
|
||||
if (message[pos] == _T('\n'))
|
||||
{
|
||||
|
@ -42,7 +42,7 @@ static wxSize wxSplitMessage2( const wxString &message, wxWindow *parent )
|
||||
int y = 10;
|
||||
int w = 50;
|
||||
wxString line( _T("") );
|
||||
for (uint pos = 0; pos < message.Len(); pos++)
|
||||
for (size_t pos = 0; pos < message.Len(); pos++)
|
||||
{
|
||||
if (message[pos] == _T('\n'))
|
||||
{
|
||||
|
@ -94,11 +94,10 @@ int wxDirDialog::ShowModal(void)
|
||||
*/
|
||||
|
||||
// Fill in the BROWSEINFO structure.
|
||||
wxWX2MBbuf message = m_message.mb_str();
|
||||
bi.hwndOwner = hWnd;
|
||||
bi.pidlRoot = NULL; // pidlPrograms;
|
||||
bi.pszDisplayName = lpBuffer;
|
||||
bi.lpszTitle = (const char*)message; // BC++ 4.52 says LPSTR, not LPTSTR?
|
||||
bi.lpszTitle = m_message.mb_str(); // BC++ 4.52 says LPSTR, not LPTSTR?
|
||||
bi.ulFlags = 0;
|
||||
bi.lpfn = NULL;
|
||||
bi.lParam = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user