Made a couple Number() to GetCount() changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -1747,7 +1747,7 @@ void wxDivisionShape::PopupMenu(double x, double y)
 | 
				
			|||||||
    oglPopupDivisionMenu->Enable(DIVISION_MENU_EDIT_TOP_EDGE, FALSE);
 | 
					    oglPopupDivisionMenu->Enable(DIVISION_MENU_EDIT_TOP_EDGE, FALSE);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  int x1, y1;
 | 
					  int x1, y1;
 | 
				
			||||||
  m_canvas->ViewStart(&x1, &y1);
 | 
					  m_canvas->GetViewStart(&x1, &y1);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  int unit_x, unit_y;
 | 
					  int unit_x, unit_y;
 | 
				
			||||||
  m_canvas->GetScrollPixelsPerUnit(&unit_x, &unit_y);
 | 
					  m_canvas->GetScrollPixelsPerUnit(&unit_x, &unit_y);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -566,7 +566,7 @@ void ListBox::Append(char *s) {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int ListBox::Length() {
 | 
					int ListBox::Length() {
 | 
				
			||||||
    return ((wxListBox*)id)->Number();
 | 
					    return ((wxListBox*)id)->GetCount();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ListBox::Select(int n) {
 | 
					void ListBox::Select(int n) {
 | 
				
			||||||
@@ -586,7 +586,7 @@ int ListBox::GetSelection() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
int ListBox::Find(const char *prefix) {
 | 
					int ListBox::Find(const char *prefix) {
 | 
				
			||||||
    if (prefix) {
 | 
					    if (prefix) {
 | 
				
			||||||
        for (int x=0; x < ((wxListBox*)id)->Number(); x++) {
 | 
					        for (int x=0; x < ((wxListBox*)id)->GetCount(); x++) {
 | 
				
			||||||
            wxString text = ((wxListBox*)id)->GetString(x);
 | 
					            wxString text = ((wxListBox*)id)->GetString(x);
 | 
				
			||||||
            if (text.StartsWith(prefix))
 | 
					            if (text.StartsWith(prefix))
 | 
				
			||||||
                return x;
 | 
					                return x;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -566,7 +566,7 @@ void ListBox::Append(char *s) {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int ListBox::Length() {
 | 
					int ListBox::Length() {
 | 
				
			||||||
    return ((wxListBox*)id)->Number();
 | 
					    return ((wxListBox*)id)->GetCount();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ListBox::Select(int n) {
 | 
					void ListBox::Select(int n) {
 | 
				
			||||||
@@ -586,7 +586,7 @@ int ListBox::GetSelection() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
int ListBox::Find(const char *prefix) {
 | 
					int ListBox::Find(const char *prefix) {
 | 
				
			||||||
    if (prefix) {
 | 
					    if (prefix) {
 | 
				
			||||||
        for (int x=0; x < ((wxListBox*)id)->Number(); x++) {
 | 
					        for (int x=0; x < ((wxListBox*)id)->GetCount(); x++) {
 | 
				
			||||||
            wxString text = ((wxListBox*)id)->GetString(x);
 | 
					            wxString text = ((wxListBox*)id)->GetString(x);
 | 
				
			||||||
            if (text.StartsWith(prefix))
 | 
					            if (text.StartsWith(prefix))
 | 
				
			||||||
                return x;
 | 
					                return x;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user