Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCH and wxUSE_* fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-07-14 19:03:10 +00:00
parent 483c90c20c
commit f0fa8b47ab
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/odcombo.h
View File

@@ -19,6 +19,7 @@
#include "wx/combo.h" #include "wx/combo.h"
#include "wx/ctrlsub.h" #include "wx/ctrlsub.h"
#include "wx/vlbox.h" #include "wx/vlbox.h"
#include "wx/timer.h"
// //
@@ -204,8 +205,10 @@ private:
// Partial completion string // Partial completion string
wxString m_partialCompletionString; wxString m_partialCompletionString;
#if wxUSE_TIMER
// Partial completion timer // Partial completion timer
wxTimer m_partialCompletionTimer; wxTimer m_partialCompletionTimer;
#endif // wxUSE_TIMER
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };

8
src/generic/odcombo.cpp
View File

@@ -238,7 +238,7 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar unicode
wxChar keychar=0; wxChar keychar=0;
if ((keycode >= WXK_SPACE) && (keycode <=255) && (keycode != WXK_DELETE) && wxIsprint(keycode)) 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 // Try partial completion
// find the new partial completion string // find the new partial completion string
#if wxUSE_TIMER
if (m_partialCompletionTimer.IsRunning()) if (m_partialCompletionTimer.IsRunning())
m_partialCompletionString+=wxString(keychar); m_partialCompletionString+=wxString(keychar);
else else
#endif // wxUSE_TIMER
m_partialCompletionString=wxString(keychar); m_partialCompletionString=wxString(keychar);
// now search through the values to see if this is found // 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 else
{ {
value=i; 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() void wxVListBoxComboPopup::StopPartialCompletion()
{ {
m_partialCompletionString = wxEmptyString; m_partialCompletionString = wxEmptyString;
#if wxUSE_TIMER
m_partialCompletionTimer.Stop(); m_partialCompletionTimer.Stop();
#endif // wxUSE_TIMER
} }
void wxVListBoxComboPopup::OnComboDoubleClick() void wxVListBoxComboPopup::OnComboDoubleClick()