X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/150e31d2088687cbfbab548f9e98918f8683d9b5..c7ff293b4280dfad1e4133b51d9e93d67c722752:/src/univ/combobox.cpp diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp index 20a06a61d4..a5fefdfa0e 100644 --- a/src/univ/combobox.cpp +++ b/src/univ/combobox.cpp @@ -328,7 +328,7 @@ void wxComboControl::DoMoveWindow(int x, int y, int width, int height) wxSize sizeBtn = m_btn->GetBestSize(); wxCoord wText = width - sizeBtn.x; - wxPoint p = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint(0,0); + wxPoint p = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint(); m_text->SetSize(x - p.x, y - p.y, wText, height); m_btn->SetSize(x - p.x + wText, y - p.y, sizeBtn.x, height); } @@ -763,7 +763,7 @@ long wxComboBox::GetInsertionPoint() const return GetText()->GetInsertionPoint(); } -long wxComboBox::GetLastPosition() const +wxTextPos wxComboBox::GetLastPosition() const { return GetText()->GetLastPosition(); } @@ -892,7 +892,7 @@ wxClientData* wxComboBox::DoGetItemClientObject(int n) const bool wxComboBox::IsEditable() const { - return GetText() != NULL && (!HasFlag(wxCB_READONLY) || GetText()->IsEditable()); + return GetText() != NULL && (!HasFlag(wxCB_READONLY) || GetText()->IsEditable()); } void wxComboBox::Undo()