X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..1baa5e4ab5761a92cf62bb3fc8829e613eb97edc:/src/msw/choice.cpp?ds=sidebyside diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp index bc0ab64e18..5074a31255 100644 --- a/src/msw/choice.cpp +++ b/src/msw/choice.cpp @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -22,6 +22,7 @@ #ifndef WX_PRECOMP #include "wx/choice.h" +#include "wx/utils.h" #endif #include "wx/msw/private.h" @@ -34,38 +35,39 @@ bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id)) { if (param == CBN_SELCHANGE) { - wxCommandEvent event(wxEVENT_TYPE_CHOICE_COMMAND, m_windowId); + wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId); event.SetInt(GetSelection()); event.SetEventObject(this); - event.SetString(copystring(GetStringSelection())); + event.SetString(GetStringSelection()); ProcessCommand(event); - delete[] event.GetString(); + return TRUE; } - else return FALSE; + else + return FALSE; } bool wxChoice::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, - int n, const wxString choices[], - long style, + int n, const wxString choices[], + long style, const wxValidator& validator, const wxString& name) { SetName(name); SetValidator(validator); if (parent) parent->AddChild(this); - SetBackgroundColour(parent->GetDefaultBackgroundColour()) ; - SetForegroundColour(parent->GetDefaultForegroundColour()) ; - no_strings = n; + SetBackgroundColour(parent->GetBackgroundColour()) ; + SetForegroundColour(parent->GetForegroundColour()) ; + m_noStrings = 0; m_windowStyle = style; if ( id == -1 ) - m_windowId = (int)NewControlId(); + m_windowId = (int)NewControlId(); else - m_windowId = id; + m_windowId = id; int x = pos.x; int y = pos.y; @@ -82,16 +84,18 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id, // Even with extended styles, need to combine with WS_BORDER // for them to look right. - if (want3D || (m_windowStyle & wxSIMPLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) || - (m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER)) + if ( want3D || wxStyleHasBorder(m_windowStyle) ) msStyle |= WS_BORDER; - HWND wx_combo = CreateWindowEx(exStyle, "COMBOBOX", NULL, + m_hWnd = (WXHWND)::CreateWindowEx(exStyle, "COMBOBOX", NULL, msStyle, 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId, wxGetInstance(), NULL); + + wxCHECK_MSG( m_hWnd, FALSE, "Failed to create combobox" ); + /* -#if CTL3D +#if wxUSE_CTL3D if (want3D) { m_useCtl3D = TRUE; @@ -100,17 +104,17 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id, #endif */ - m_hWnd = (WXHWND) wx_combo; - // Subclass again for purposes of dialog editing mode - SubclassWin((WXHWND) wx_combo); + SubclassWin(m_hWnd); - SetFont(* parent->GetFont()); + SetFont(parent->GetFont()); int i; for (i = 0; i < n; i++) - SendMessage(wx_combo, CB_INSERTSTRING, i, (LONG)(const char *)choices[i]); - SendMessage(wx_combo, CB_SETCURSEL, i, 0); + { + Append(choices[i]); + } + SetSelection(n); SetSize(x, y, width, height); @@ -121,19 +125,19 @@ void wxChoice::Append(const wxString& item) { SendMessage((HWND) GetHWND(), CB_ADDSTRING, 0, (LONG)(const char *)item); - no_strings ++; + m_noStrings ++; } void wxChoice::Delete(int n) { - no_strings = (int)SendMessage((HWND) GetHWND(), CB_DELETESTRING, n, 0); + m_noStrings = (int)SendMessage((HWND) GetHWND(), CB_DELETESTRING, n, 0); } void wxChoice::Clear(void) { SendMessage((HWND) GetHWND(), CB_RESETCONTENT, 0, 0); - no_strings = 0; + m_noStrings = 0; } @@ -177,7 +181,7 @@ wxString wxChoice::GetString(int n) const return wxString(wxBuffer); } -void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags) +void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags) { int currentX, currentY; GetPosition(¤tX, ¤tY); @@ -192,6 +196,8 @@ void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags) if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) y1 = currentY; + AdjustForParentClientOrigin(x1, y1, sizeFlags); + // If we're prepared to use the existing size, then... if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO)) { @@ -200,9 +206,9 @@ void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags) int cx; // button font dimensions int cy; - wxGetCharSize(GetHWND(), &cx, &cy, GetFont()); + wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont()); - float control_width, control_height; + int control_width, control_height; // Ignore height parameter because height doesn't // mean 'initially displayed' height, it refers to the @@ -216,53 +222,59 @@ void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags) if (width <= 0) { // Find the longest string - if (no_strings == 0) - control_width = (float)100.0; + if (m_noStrings == 0) + { + control_width = 100; + } else { int len, ht; - float longest = (float)0.0; + int longest = 0; int i; - for (i = 0; i < no_strings; i++) + for (i = 0; i < m_noStrings; i++) { wxString str(GetString(i)); - GetTextExtent(str, &len, &ht, NULL, NULL,GetFont()); - if ( len > longest) longest = len; + GetTextExtent(str, &len, &ht, NULL, NULL, & this->GetFont()); + if ( len > longest) + longest = len; } - control_width = (float)(int)(longest + cx*5); + control_width = longest + cx*5; } } + else + { + // If non-default width... + control_width = w1; + } + // Choice drop-down list depends on number of items (limited to 10) if (h1 <= 0) { - if (no_strings == 0) - h1 = (int)(EDIT_CONTROL_FACTOR*cy*10.0); - else h1 = (int)(EDIT_CONTROL_FACTOR*cy*(wxMin(10, no_strings) + 1)); + if (m_noStrings == 0) + h1 = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)*10; + else + h1 = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)*(wxMin(10, m_noStrings) + 1); } - // If non-default width... - if (width >= 0) - control_width = (float)width; - - control_height = (float)h1; + control_height = h1; // Calculations may have made text size too small if (control_height <= 0) - control_height = (float)(int)(cy*EDIT_CONTROL_FACTOR) ; + control_height = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy); if (control_width <= 0) - control_width = (float)100.0; + control_width = 100; - MoveWindow((HWND) GetHWND(), x1, y1, - (int)control_width, (int)control_height, TRUE); + MoveWindow((HWND)GetHWND(), x1, y1, + control_width, control_height, TRUE); } WXHBRUSH wxChoice::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam) + WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { - return 0; + return 0; } long wxChoice::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)