#pragma hdrstop
#endif
-#if wxUSE_CHOICE
+#if wxUSE_CHOICE && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
#ifndef WX_PRECOMP
#include "wx/choice.h"
wxFLAGS_MEMBER(wxBORDER_RAISED)
wxFLAGS_MEMBER(wxBORDER_STATIC)
wxFLAGS_MEMBER(wxBORDER_NONE)
-
+
// old style border flags
wxFLAGS_MEMBER(wxSIMPLE_BORDER)
wxFLAGS_MEMBER(wxSUNKEN_BORDER)
IMPLEMENT_DYNAMIC_CLASS_XTI(wxChoice, wxControl,"wx/choice.h")
wxBEGIN_PROPERTIES_TABLE(wxChoice)
- wxEVENT_PROPERTY( Select , wxEVT_COMMAND_CHOICE_SELECTED , wxCommandEvent )
+ wxEVENT_PROPERTY( Select , wxEVT_COMMAND_CHOICE_SELECTED , wxCommandEvent )
- wxPROPERTY( Font , wxFont , SetFont , GetFont , , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxPROPERTY( Font , wxFont , SetFont , GetFont , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
wxPROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY( Selection ,int, SetSelection, GetSelection, , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY_FLAGS( WindowStyle , wxChoiceStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+ wxPROPERTY( Selection ,int, SetSelection, GetSelection, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxPROPERTY_FLAGS( WindowStyle , wxChoiceStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
wxEND_PROPERTIES_TABLE()
wxBEGIN_HANDLERS_TABLE(wxChoice)
wxEND_HANDLERS_TABLE()
-wxCONSTRUCTOR_4( wxChoice , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
+wxCONSTRUCTOR_4( wxChoice , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
#else
IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
#endif
/*
- TODO PROPERTIES
- selection (long)
- content (list)
- item
+ TODO PROPERTIES
+ selection (long)
+ content (list)
+ item
*/
// ============================================================================
bool wxChoice::CreateAndInit(wxWindow *parent,
wxWindowID id,
const wxPoint& pos,
- const wxSize& sizeOrig,
+ const wxSize& size,
int n, const wxString choices[],
long style,
const wxValidator& validator,
const wxString& name)
{
- // this is a bit hackish but we want to prevent MSWCreateControl() from
- // calling SetBestSize() (which it would do if any of the size components
- // is not given) because it wouldn't calculate it correctly if we have any
- // strings as they're not yet added to the control when it is called
- //
- // so: if we have any strings, we fudge the size parameter so that
- // SetBestSize() is not called by MSWCreateControl() but then we do call it
- // manually below
- bool autoSize = false;
- wxSize size = sizeOrig;
- if ( n )
- {
- if ( size.x < 0 )
- {
- size.x = 1;
- autoSize = true;
- }
- if ( size.y < 0 )
- {
- size.y = 1;
- autoSize = true;
- }
- }
-
// initialize wxControl
if ( !CreateControl(parent, id, pos, size, style, validator, name) )
- return FALSE;
+ return false;
// now create the real HWND
if ( !MSWCreateControl(wxT("COMBOBOX"), _T(""), pos, size) )
- return FALSE;
+ return false;
// choice/combobox normally has "white" (depends on colour scheme, of
}
// and now we may finally size the control properly (if needed)
- if ( autoSize )
- {
- SetBestSize(sizeOrig);
- }
+ SetBestSize(size);
- return TRUE;
+ return true;
}
bool wxChoice::Create(wxWindow *parent,
style, validator, name);
}
+bool wxChoice::MSWShouldPreProcessMessage(WXMSG *pMsg)
+{
+ MSG *msg = (MSG *) pMsg;
+
+ // if the dropdown list is visible, don't preprocess certain keys
+ if ( msg->message == WM_KEYDOWN
+ && (msg->wParam == VK_ESCAPE || msg->wParam == VK_RETURN) )
+ {
+ if (::SendMessage(GetHwndOf(this), CB_GETDROPPEDSTATE, 0, 0))
+ {
+ return false;
+ }
+ }
+
+ return wxControl::MSWShouldPreProcessMessage(pMsg);
+}
+
WXDWORD wxChoice::MSWGetStyle(long style, WXDWORD *exstyle) const
{
// we never have an external border
int wxChoice::DoAppend(const wxString& item)
{
- int n = (int)SendMessage(GetHwnd(), CB_ADDSTRING, 0, (LONG)item.c_str());
+ int n = (int)SendMessage(GetHwnd(), CB_ADDSTRING, 0, (LPARAM)item.c_str());
if ( n == CB_ERR )
{
wxLogLastError(wxT("SendMessage(CB_ADDSTRING)"));
{
// we need to refresh our size in order to have enough space for the
// newly added items
- UpdateVisibleHeight();
+ if ( !IsFrozen() )
+ UpdateVisibleHeight();
}
return n;
wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
- int n = (int)SendMessage(GetHwnd(), CB_INSERTSTRING, pos, (LONG)item.c_str());
+ int n = (int)SendMessage(GetHwnd(), CB_INSERTSTRING, pos, (LPARAM)item.c_str());
if ( n == CB_ERR )
{
wxLogLastError(wxT("SendMessage(CB_INSERTSTRING)"));
}
else // ok
{
- UpdateVisibleHeight();
+ if ( !IsFrozen() )
+ UpdateVisibleHeight();
}
return n;
SendMessage(GetHwnd(), CB_DELETESTRING, n, 0);
- UpdateVisibleHeight();
+ if ( !IsFrozen() )
+ UpdateVisibleHeight();
}
void wxChoice::Clear()
SendMessage(GetHwnd(), CB_RESETCONTENT, 0, 0);
- UpdateVisibleHeight();
+ if ( !IsFrozen() )
+ UpdateVisibleHeight();
}
void wxChoice::Free()
for ( int i = 0; i < count; i++ )
{
// as CB_FINDSTRINGEXACT is case insensitive, be case insensitive too
- if ( GetString(i).IsSameAs(s, FALSE) )
+ if ( GetString(i).IsSameAs(s, false) )
return i;
}
return wxNOT_FOUND;
#else // !Watcom
- int pos = (int)SendMessage(GetHwnd(), CB_FINDSTRINGEXACT,
- (WPARAM)-1, (LPARAM)s.c_str());
-
- return pos == LB_ERR ? wxNOT_FOUND : pos;
+ //TODO: Evidently some MSW versions (all?) don't like empty strings
+ //passed to SendMessage, so we have to do it ourselves in that case
+ if ( s.size() == 0 )
+ {
+ int count = GetCount();
+ for ( int i = 0; i < count; i++ )
+ {
+ if ( GetString(i).size() == 0 )
+ return i;
+ }
+
+ return wxNOT_FOUND;
+ }
+ else
+ {
+ int pos = (int)SendMessage(GetHwnd(), CB_FINDSTRINGEXACT,
+ (WPARAM)-1, (LPARAM)s.c_str());
+
+ return pos == LB_ERR ? wxNOT_FOUND : pos;
+ }
#endif // Watcom/!Watcom
}
// wxMSW specific helpers
// ----------------------------------------------------------------------------
-int wxChoice::GetVisibleHeight() const
-{
- return ::SendMessage(GetHwnd(), CB_GETITEMHEIGHT, (WPARAM)-1, 0);
-}
-
void wxChoice::UpdateVisibleHeight()
{
// be careful to not change the width here
- DoSetSize(-1, -1, -1, GetVisibleHeight(), wxSIZE_USE_EXISTING);
+ DoSetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, GetSize().y, wxSIZE_USE_EXISTING);
}
void wxChoice::DoMoveWindow(int x, int y, int width, int height)
void wxChoice::DoGetSize(int *w, int *h) const
{
+ // this is weird: sometimes, the height returned by Windows is clearly the
+ // total height of the control including the drop down list -- but only
+ // sometimes, and normally it isn't... I have no idea about what to do with
+ // this
wxControl::DoGetSize(w, h);
-
- // we need to return only the height of the visible part, not the entire
- // height in the Windows sense which includes the height of the drop down
- // list as well
- if ( h )
- *h = GetVisibleHeight();
}
void wxChoice::DoSetSize(int x, int y,
// the height which we must pass to Windows should be the total height of
// the control including the drop down list while the height given to us
// is, of course, just the height of the permanently visible part of it
- if ( height != -1 )
+ if ( height != wxDefaultCoord )
{
// don't make the drop down list too tall, arbitrarily limit it to 40
// items max and also don't leave it empty
size_t nItems = GetCount();
if ( !nItems )
nItems = 9;
- else if ( nItems > 39 )
- nItems = 39;
+ else if ( nItems > 24 )
+ nItems = 24;
// add space for the drop down list
const int hItem = SendMessage(GetHwnd(), CB_GETITEMHEIGHT, 0, 0);
wxControl::DoSetSize(x, y, width, height, sizeFlags);
+ // I'm commenting this out since the code appears to make choices
+ // and comboxes too high when they have associated sizers. I'm sure this
+ // is not the end of the story, which is why I'm leaving it #if'ed out for
+ // now. JACS.
+#if 0
// if the height specified for the visible part of the control is
// different from the current one, we need to change it separately
// as it is not affected by normal WM_SETSIZE
- if ( height != -1 )
+ if ( height != wxDefaultCoord )
{
- const int hVisibleCurrent = GetVisibleHeight();
- if ( hVisibleCurrent != heightOrig )
+ const int delta = heightOrig - GetSize().y;
+ if ( delta )
{
- SendMessage(GetHwnd(), CB_SETITEMHEIGHT, (WPARAM)-1, heightOrig);
+ int h = ::SendMessage(GetHwnd(), CB_GETITEMHEIGHT, (WPARAM)-1, 0);
+ SendMessage(GetHwnd(), CB_SETITEMHEIGHT, (WPARAM)-1, h + delta);
}
}
+#else
+ wxUnusedVar(heightOrig);
+#endif
}
wxSize wxChoice::DoGetBestSize() const
// the combobox should be slightly larger than the widest string
wChoice += 5*GetCharWidth();
- return wxSize(wChoice, GetVisibleHeight());
+ return wxSize(wChoice, EDIT_HEIGHT_FROM_CHAR_HEIGHT(GetCharHeight()));
}
-long wxChoice::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+WXLRESULT wxChoice::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
{
- if ( nMsg == WM_LBUTTONUP )
+ switch ( nMsg )
{
- int x = (int)LOWORD(lParam);
- int y = (int)HIWORD(lParam);
-
- // Ok, this is truly weird, but if a panel with a wxChoice loses the
- // focus, then you get a *fake* WM_LBUTTONUP message with x = 65535 and
- // y = 65535. Filter out this nonsense.
- //
- // VZ: I'd like to know how to reproduce this please...
- if ( x == 65535 && y == 65535 )
- return 0;
+ case WM_LBUTTONUP:
+ {
+ int x = (int)LOWORD(lParam);
+ int y = (int)HIWORD(lParam);
+
+ // Ok, this is truly weird, but if a panel with a wxChoice
+ // loses the focus, then you get a *fake* WM_LBUTTONUP message
+ // with x = 65535 and y = 65535. Filter out this nonsense.
+ //
+ // VZ: I'd like to know how to reproduce this please...
+ if ( x == 65535 && y == 65535 )
+ return 0;
+ }
+ break;
+
+ // we have to handle both: one for the normal case and the other
+ // for readonly
+ case WM_CTLCOLOREDIT:
+ case WM_CTLCOLORLISTBOX:
+ case WM_CTLCOLORSTATIC:
+ {
+ WXWORD nCtlColor;
+ WXHDC hdc;
+ WXHWND hwnd;
+ UnpackCtlColor(wParam, lParam, &nCtlColor, &hdc, &hwnd);
+
+ return (WXLRESULT)OnCtlColor(hdc, hwnd, nCtlColor,
+ nMsg, wParam, lParam);
+ }
}
return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
if ( param != CBN_SELCHANGE)
{
// "selection changed" is the only event we're after
- return FALSE;
+ return false;
}
int n = GetSelection();
ProcessCommand(event);
}
- return TRUE;
+ return true;
}
WXHBRUSH wxChoice::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor),
return (WXHBRUSH)brush->GetResourceHandle();
}
-#endif // wxUSE_CHOICE
+#endif // wxUSE_CHOICE && !(__SMARTPHONE__ && __WXWINCE__)
projects / wxWidgets.git / blobdiff