compilation fixes for wxMSW

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 969e9ca9343f98fb229cffa83d69317f6de3c6b2..8676d7481b10b2d062be13c717cf74090ffa5bb1 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -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
  *

diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index 9195ffc2d16567888c5e8bdfb69460e35db70bb0..2529df3ccdb409e54c237c48929b9e85c3f95b6f 100644 (file)
--- a/src/generic/choicdgg.cpp
+++ b/src/generic/choicdgg.cpp
@@ -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'))
         {

diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index d2137b4e0b4fbdfa2c7748e0b2f4be91cb2d2f59..1c64ac410f2be84cad07d3d96ea76d128c4f2727 100644 (file)
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -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'))
         {

diff --git a/src/msw/dirdlg.cpp b/src/msw/dirdlg.cpp
index 80b5e4dbb4e11359bc1d6f0463c0473bef3cee12..66ad5c708e0dc57b7f7bfef37c6830776f21167b 100644 (file)
--- a/src/msw/dirdlg.cpp
+++ b/src/msw/dirdlg.cpp
@@ -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;