PCH and wxUSE_* fix.

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

diff --git a/include/wx/odcombo.h b/include/wx/odcombo.h
index 5dd14a08aa54cc6e9823cd3028758460c69f92cd..c187957c3146b90ef74cafd57a9b2be249b4baeb 100644 (file)
--- a/include/wx/odcombo.h
+++ b/include/wx/odcombo.h
@@ -19,6 +19,7 @@
 #include "wx/combo.h"
 #include "wx/ctrlsub.h"
 #include "wx/vlbox.h"
 #include "wx/combo.h"
 #include "wx/ctrlsub.h"
 #include "wx/vlbox.h"

+#include "wx/timer.h"

 
 
 //
 
 
 //


@@ -204,8 +205,10 @@ private:
     // Partial completion string
     wxString                m_partialCompletionString;
 
     // Partial completion string
     wxString                m_partialCompletionString;
 

+#if wxUSE_TIMER

     // Partial completion timer
     wxTimer                 m_partialCompletionTimer;
     // Partial completion timer
     wxTimer                 m_partialCompletionTimer;

+#endif // wxUSE_TIMER

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };

diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp
index cfa07e2ed1869214826243630f5f951659476251..c2a9e98294802c28dfe13f59e957f25f5a7c7777 100644 (file)
--- a/src/generic/odcombo.cpp
+++ b/src/generic/odcombo.cpp
@@ -238,7 +238,7 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar unicode
     wxChar keychar=0;
     if ((keycode >= WXK_SPACE) && (keycode <=255) && (keycode != WXK_DELETE) && wxIsprint(keycode))
     {
     wxChar keychar=0;
     if ((keycode >= WXK_SPACE) && (keycode <=255) && (keycode != WXK_DELETE) && wxIsprint(keycode))
     {

-        keychar = keycode;
+        keychar = (wxChar)keycode;

     }
     else if (unicode>0)
     {
     }
     else if (unicode>0)
     {


@@ -270,9 +270,11 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar unicode
         // Try partial completion
 
         // find the new partial completion string
         // Try partial completion
 
         // find the new partial completion string

+#if wxUSE_TIMER

         if (m_partialCompletionTimer.IsRunning())
             m_partialCompletionString+=wxString(keychar);
         else
         if (m_partialCompletionTimer.IsRunning())
             m_partialCompletionString+=wxString(keychar);
         else

+#endif // wxUSE_TIMER

             m_partialCompletionString=wxString(keychar);
 
         // now search through the values to see if this is found
             m_partialCompletionString=wxString(keychar);
 
         // now search through the values to see if this is found


@@ -298,7 +300,9 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar unicode
         else
         {
             value=i;
         else
         {
             value=i;

+#if wxUSE_TIMER

             m_partialCompletionTimer.Start(wxODCB_PARTIAL_COMPLETION_TIME, true);
             m_partialCompletionTimer.Start(wxODCB_PARTIAL_COMPLETION_TIME, true);

+#endif // wxUSE_TIMER

         }
     }
     else
         }
     }
     else


@@ -338,7 +342,9 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar unicode
 void wxVListBoxComboPopup::StopPartialCompletion()
 {
     m_partialCompletionString = wxEmptyString;
 void wxVListBoxComboPopup::StopPartialCompletion()
 {
     m_partialCompletionString = wxEmptyString;

+#if wxUSE_TIMER

     m_partialCompletionTimer.Stop();
     m_partialCompletionTimer.Stop();

+#endif // wxUSE_TIMER

 }
 
 void wxVListBoxComboPopup::OnComboDoubleClick()
 }
 
 void wxVListBoxComboPopup::OnComboDoubleClick()