Build fix.

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

diff --git a/include/wx/volume.h b/include/wx/volume.h
index b179ca76751abdfa07e6f549d055dd7d5a112509..7ecdb38e30f87b9357c183e9d9ddcf0c7ddcad07 100644 (file)
--- a/include/wx/volume.h
+++ b/include/wx/volume.h
@@ -20,6 +20,8 @@
 
 #if wxUSE_FSVOLUME
 
 
 #if wxUSE_FSVOLUME
 

+#include "wx/arrstr.h"
+

 // the volume flags
 enum
 {
 // the volume flags
 enum
 {


@@ -142,4 +144,3 @@ typedef wxFSVolumeBase wxFSVolume;
 #endif // wxUSE_FSVOLUME
 
 #endif // _WX_FSVOLUME_H_
 #endif // wxUSE_FSVOLUME
 
 #endif // _WX_FSVOLUME_H_

-

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index a547a1e201f71756f29c3d8ac690e9520e387f9b..da53404e287203e87317a8d4997f949573928bc2 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -752,11 +752,13 @@ int wxPrintfConvSpec::Process(wxChar *buf, size_t lenMax, wxPrintfArg *p)
 #else
                     p->pad_char;
 
 #else
                     p->pad_char;
 

+#if wxUSE_WCHAR_T

                 if (type == wxPAT_WCHAR) {
                     // user passed a character explicitely indicated as Unicode...
                     const wchar_t buf[2] = { p->pad_wchar, 0 };
                     val = wxString(buf, wxConvLibc)[0u];
                 }
                 if (type == wxPAT_WCHAR) {
                     // user passed a character explicitely indicated as Unicode...
                     const wchar_t buf[2] = { p->pad_wchar, 0 };
                     val = wxString(buf, wxConvLibc)[0u];
                 }

+#endif

 #endif
 
                 size_t i;
 #endif
 
                 size_t i;


@@ -788,10 +790,12 @@ int wxPrintfConvSpec::Process(wxChar *buf, size_t lenMax, wxPrintfArg *p)
 #else
                     p->pad_pchar;
 
 #else
                     p->pad_pchar;
 

+#if wxUSE_WCHAR_T

                 if (type == wxPAT_PWCHAR) {
                     // user passed a string explicitely indicated as Unicode...
                     val = wxString(p->pad_pwchar, wxConvLibc);
                 }
                 if (type == wxPAT_PWCHAR) {
                     // user passed a string explicitely indicated as Unicode...
                     val = wxString(p->pad_pwchar, wxConvLibc);
                 }

+#endif

 #endif
                 int len;
 
 #endif
                 int len;
 

diff --git a/src/palmos/volume.cpp b/src/palmos/volume.cpp
index 5deb0a6427ec14f6fde6f0397f384618cf3dd585..042acfd85b6b47b552ba1f24163d303599126e11 100644 (file)
--- a/src/palmos/volume.cpp
+++ b/src/palmos/volume.cpp
@@ -25,6 +25,8 @@
 
 #if wxUSE_FSVOLUME
 
 
 #if wxUSE_FSVOLUME
 

+#include "wx/volume.h"
+

 #ifndef WX_PRECOMP
     #if wxUSE_GUI
         #include "wx/icon.h"
 #ifndef WX_PRECOMP
     #if wxUSE_GUI
         #include "wx/icon.h"


@@ -33,7 +35,7 @@
 #endif // WX_PRECOMP
 
 #include "wx/arrstr.h"
 #endif // WX_PRECOMP
 
 #include "wx/arrstr.h"

-#include "wx/volume.h"
+#include "wx/hashmap.h"

 
 #include <VFSMgr.h>
 #include <PalmTypesCompatibility.h>
 
 #include <VFSMgr.h>
 #include <PalmTypesCompatibility.h>


@@ -232,4 +234,3 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
 #endif // wxUSE_GUI
 
 #endif // wxUSE_FSVOLUME
 #endif // wxUSE_GUI
 
 #endif // wxUSE_FSVOLUME

-

diff --git a/src/palmos/window.cpp b/src/palmos/window.cpp
index b18b7f742d5b2ed8a4de0e59aa949691e86abadf..fdcf02cf3f93b81de4e02262980d2d53367c30fa 100644 (file)
--- a/src/palmos/window.cpp
+++ b/src/palmos/window.cpp
@@ -233,6 +233,16 @@ wxWindow *wxWindowPalm::FindItemByWinHandle(WXWINHANDLE handle, bool controlOnly
     return NULL;
 }
 
     return NULL;
 }
 

+bool wxGetKeyState(wxKeyCode key)
+{
+    wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key !=
+        WXK_MBUTTON, wxT("can't use wxGetKeyState() for mouse buttons"));
+
+    // TODO
+
+    return false;
+}
+

 // ----------------------------------------------------------------------------
 // constructors and such
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constructors and such
 // ----------------------------------------------------------------------------