Made a couple Number() to GetCount() changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/ogl/composit.cpp b/contrib/src/ogl/composit.cpp
index ba237db51f65681ac841394d8b5c83e0d7a14858..6dbc6190a7a4c712d63c5fbc9789bf6c1cefaec6 100644 (file)
--- a/contrib/src/ogl/composit.cpp
+++ b/contrib/src/ogl/composit.cpp
@@ -1747,7 +1747,7 @@ void wxDivisionShape::PopupMenu(double x, double y)
     oglPopupDivisionMenu->Enable(DIVISION_MENU_EDIT_TOP_EDGE, FALSE);
 
   int x1, y1;
     oglPopupDivisionMenu->Enable(DIVISION_MENU_EDIT_TOP_EDGE, FALSE);
 
   int x1, y1;

-  m_canvas->ViewStart(&x1, &y1);
+  m_canvas->GetViewStart(&x1, &y1);

 
   int unit_x, unit_y;
   m_canvas->GetScrollPixelsPerUnit(&unit_x, &unit_y);
 
   int unit_x, unit_y;
   m_canvas->GetScrollPixelsPerUnit(&unit_x, &unit_y);

diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp
index e0eeab7d987da4c9f1e41272013d22d20aced064..2b478141af6e6ddc62f8e84c00752f15b7665240 100644 (file)
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -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) {
     if (prefix) {
 
 int ListBox::Find(const char *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);
             if (text.StartsWith(prefix))
                 return x;
             wxString text = ((wxListBox*)id)->GetString(x);
             if (text.StartsWith(prefix))
                 return x;

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index e0eeab7d987da4c9f1e41272013d22d20aced064..2b478141af6e6ddc62f8e84c00752f15b7665240 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -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) {
     if (prefix) {
 
 int ListBox::Find(const char *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);
             if (text.StartsWith(prefix))
                 return x;
             wxString text = ((wxListBox*)id)->GetString(x);
             if (text.StartsWith(prefix))
                 return x;