Made various Motif fixes, wxListBox/wxChoice derive from wxControlWithItems,
added release.txt git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -384,14 +384,21 @@ void wxPreviewControlBar::CreateButtons()
|
||||
"120%", "150%", "200%"
|
||||
};
|
||||
|
||||
m_zoomControl = new wxChoice(this, wxID_PREVIEW_ZOOM,
|
||||
wxPoint(x, y), wxSize(100, -1));
|
||||
|
||||
// Yes, this look stupid, but this is because gcc gives up otherwise.
|
||||
int n = WXSIZEOF(choices);
|
||||
// Someone is calling methods that do no exist in wxChoice!! So I'll just comment out for VA for now
|
||||
for ( int i = 0; i < n; i++ )
|
||||
m_zoomControl->Append(choices[i]);
|
||||
|
||||
wxString* strings = new wxString[n];
|
||||
int i;
|
||||
for (i = 0; i < n; i++ )
|
||||
strings[i] = choices[i];
|
||||
|
||||
m_zoomControl = new wxChoice(this, wxID_PREVIEW_ZOOM,
|
||||
wxPoint(x, y),
|
||||
wxSize(100, -1),
|
||||
n,
|
||||
strings
|
||||
);
|
||||
delete[] strings;
|
||||
|
||||
SetZoomControl(m_printPreview->GetZoom());
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user