Warning fix.

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

diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp
index 5d7948423b3685ef92d4551c003ad19a278a87d5..7b406629011a59541c2808f34ed4f32f8f8ff0a5 100644 (file)
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -108,7 +108,7 @@ void Font::Create(const char *faceName, int characterSet, int size, bool bold, b
     // so we adjust the encoding before passing it to Scintilla.  See also
     // wxStyledTextCtrl::StyleSetCharacterSet
     wxFontEncoding encoding = (wxFontEncoding)(characterSet-1);
     // so we adjust the encoding before passing it to Scintilla.  See also
     // wxStyledTextCtrl::StyleSetCharacterSet
     wxFontEncoding encoding = (wxFontEncoding)(characterSet-1);

-    
+

     wxFontEncodingArray ea = wxEncodingConverter::GetPlatformEquivalents(encoding);
     if (ea.GetCount())
         encoding = ea[0];
     wxFontEncodingArray ea = wxEncodingConverter::GetPlatformEquivalents(encoding);
     if (ea.GetCount())
         encoding = ea[0];


@@ -667,7 +667,7 @@ END_EVENT_TABLE()
 
 
 
 
 
 

-#if wxUSE_POPUPWIN //-----------------------------------   
+#if wxUSE_POPUPWIN //-----------------------------------

 #include <wx/popupwin.h>
 
 
 #include <wx/popupwin.h>
 
 


@@ -677,9 +677,9 @@ END_EVENT_TABLE()
 // implement wxPopupWindow for the Mac!!)
 //
 // In the meantime, be careful to duplicate any changes as needed...
 // implement wxPopupWindow for the Mac!!)
 //
 // In the meantime, be careful to duplicate any changes as needed...

-//    
-    
-// A popup window to place the wxSTCListBox upon    
+//
+
+// A popup window to place the wxSTCListBox upon

 class wxSTCListBoxWin : public wxPopupWindow
 {
 private:
 class wxSTCListBoxWin : public wxPopupWindow
 {
 private:


@@ -687,7 +687,7 @@ private:
     CallBackAction      doubleClickAction;
     void*               doubleClickActionData;
 public:
     CallBackAction      doubleClickAction;
     void*               doubleClickActionData;
 public:

-    wxSTCListBoxWin(wxWindow* parent, wxWindowID id, Point location) :
+    wxSTCListBoxWin(wxWindow* parent, wxWindowID id, Point WXUNUSED(location)) :

         wxPopupWindow(parent, wxBORDER_NONE)
     {
         SetBackgroundColour(*wxBLACK);  // for our simple border
         wxPopupWindow(parent, wxBORDER_NONE)
     {
         SetBackgroundColour(*wxBLACK);  // for our simple border


@@ -703,7 +703,7 @@ public:
         // "right" to the user.  But since the wxPopupWindow or its children
         // can't receive focus then we have to pull a fast one and temporarily
         // parent the listctrl on the STC window and then call SetFocus and
         // "right" to the user.  But since the wxPopupWindow or its children
         // can't receive focus then we have to pull a fast one and temporarily
         // parent the listctrl on the STC window and then call SetFocus and

-        // then reparent it back to the popup. 
+        // then reparent it back to the popup.

         lv->SetFocus();
         lv->Reparent(this);
 #ifdef __WXMSW__
         lv->SetFocus();
         lv->Reparent(this);
 #ifdef __WXMSW__


@@ -794,7 +794,7 @@ BEGIN_EVENT_TABLE(wxSTCListBoxWin, wxPopupWindow)
     EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxSTCListBoxWin::OnActivate)
 END_EVENT_TABLE()
 
     EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxSTCListBoxWin::OnActivate)
 END_EVENT_TABLE()
 

-    
+

 
 #else // wxUSE_POPUPWIN -----------------------------------
 
 
 #else // wxUSE_POPUPWIN -----------------------------------
 


@@ -882,7 +882,7 @@ public:
         return rv;
     }
 #endif
         return rv;
     }
 #endif

-    
+

     void OnActivate(wxListEvent& WXUNUSED(event)) {
         doubleClickAction(doubleClickActionData);
     }
     void OnActivate(wxListEvent& WXUNUSED(event)) {
         doubleClickAction(doubleClickActionData);
     }


@@ -1055,7 +1055,7 @@ void ListBoxImpl::Append(const wxString& text, int type) {
     long count  = GETLB(id)->GetItemCount();
     long itemID  = GETLB(id)->InsertItem(count, wxEmptyString);
     GETLB(id)->SetItem(itemID, 1, text);
     long count  = GETLB(id)->GetItemCount();
     long itemID  = GETLB(id)->InsertItem(count, wxEmptyString);
     GETLB(id)->SetItem(itemID, 1, text);

-    maxStrWidth = wxMax(maxStrWidth, text.Length());
+    maxStrWidth = wxMax(maxStrWidth, text.length());

     if (type != -1) {
         wxCHECK_RET(imgTypeMap, wxT("Unexpected NULL imgTypeMap"));
         long idx = imgTypeMap->Item(type);
     if (type != -1) {
         wxCHECK_RET(imgTypeMap, wxT("Unexpected NULL imgTypeMap"));
         long idx = imgTypeMap->Item(type);


@@ -1065,7 +1065,7 @@ void ListBoxImpl::Append(const wxString& text, int type) {
 
 void ListBoxImpl::SetList(const char* list, char separator, char typesep) {
     GETLB(id)->Freeze();
 
 void ListBoxImpl::SetList(const char* list, char separator, char typesep) {
     GETLB(id)->Freeze();

-    Clear();    
+    Clear();

     wxStringTokenizer tkzr(stc2wx(list), (wxChar)separator);
     while ( tkzr.HasMoreTokens() ) {
         wxString token = tkzr.GetNextToken();
     wxStringTokenizer tkzr(stc2wx(list), (wxChar)separator);
     while ( tkzr.HasMoreTokens() ) {
         wxString token = tkzr.GetNextToken();


@@ -1396,9 +1396,3 @@ const wxWX2MBbuf wx2stc(const wxString& str)
 }
 
 #endif
 }
 
 #endif

-
-
-
-
-
-

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 5d7948423b3685ef92d4551c003ad19a278a87d5..7b406629011a59541c2808f34ed4f32f8f8ff0a5 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -108,7 +108,7 @@ void Font::Create(const char *faceName, int characterSet, int size, bool bold, b
     // so we adjust the encoding before passing it to Scintilla.  See also
     // wxStyledTextCtrl::StyleSetCharacterSet
     wxFontEncoding encoding = (wxFontEncoding)(characterSet-1);
     // so we adjust the encoding before passing it to Scintilla.  See also
     // wxStyledTextCtrl::StyleSetCharacterSet
     wxFontEncoding encoding = (wxFontEncoding)(characterSet-1);

-    
+

     wxFontEncodingArray ea = wxEncodingConverter::GetPlatformEquivalents(encoding);
     if (ea.GetCount())
         encoding = ea[0];
     wxFontEncodingArray ea = wxEncodingConverter::GetPlatformEquivalents(encoding);
     if (ea.GetCount())
         encoding = ea[0];


@@ -667,7 +667,7 @@ END_EVENT_TABLE()
 
 
 
 
 
 

-#if wxUSE_POPUPWIN //-----------------------------------   
+#if wxUSE_POPUPWIN //-----------------------------------

 #include <wx/popupwin.h>
 
 
 #include <wx/popupwin.h>
 
 


@@ -677,9 +677,9 @@ END_EVENT_TABLE()
 // implement wxPopupWindow for the Mac!!)
 //
 // In the meantime, be careful to duplicate any changes as needed...
 // implement wxPopupWindow for the Mac!!)
 //
 // In the meantime, be careful to duplicate any changes as needed...

-//    
-    
-// A popup window to place the wxSTCListBox upon    
+//
+
+// A popup window to place the wxSTCListBox upon

 class wxSTCListBoxWin : public wxPopupWindow
 {
 private:
 class wxSTCListBoxWin : public wxPopupWindow
 {
 private:


@@ -687,7 +687,7 @@ private:
     CallBackAction      doubleClickAction;
     void*               doubleClickActionData;
 public:
     CallBackAction      doubleClickAction;
     void*               doubleClickActionData;
 public:

-    wxSTCListBoxWin(wxWindow* parent, wxWindowID id, Point location) :
+    wxSTCListBoxWin(wxWindow* parent, wxWindowID id, Point WXUNUSED(location)) :

         wxPopupWindow(parent, wxBORDER_NONE)
     {
         SetBackgroundColour(*wxBLACK);  // for our simple border
         wxPopupWindow(parent, wxBORDER_NONE)
     {
         SetBackgroundColour(*wxBLACK);  // for our simple border


@@ -703,7 +703,7 @@ public:
         // "right" to the user.  But since the wxPopupWindow or its children
         // can't receive focus then we have to pull a fast one and temporarily
         // parent the listctrl on the STC window and then call SetFocus and
         // "right" to the user.  But since the wxPopupWindow or its children
         // can't receive focus then we have to pull a fast one and temporarily
         // parent the listctrl on the STC window and then call SetFocus and

-        // then reparent it back to the popup. 
+        // then reparent it back to the popup.

         lv->SetFocus();
         lv->Reparent(this);
 #ifdef __WXMSW__
         lv->SetFocus();
         lv->Reparent(this);
 #ifdef __WXMSW__


@@ -794,7 +794,7 @@ BEGIN_EVENT_TABLE(wxSTCListBoxWin, wxPopupWindow)
     EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxSTCListBoxWin::OnActivate)
 END_EVENT_TABLE()
 
     EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxSTCListBoxWin::OnActivate)
 END_EVENT_TABLE()
 

-    
+

 
 #else // wxUSE_POPUPWIN -----------------------------------
 
 
 #else // wxUSE_POPUPWIN -----------------------------------
 


@@ -882,7 +882,7 @@ public:
         return rv;
     }
 #endif
         return rv;
     }
 #endif

-    
+

     void OnActivate(wxListEvent& WXUNUSED(event)) {
         doubleClickAction(doubleClickActionData);
     }
     void OnActivate(wxListEvent& WXUNUSED(event)) {
         doubleClickAction(doubleClickActionData);
     }


@@ -1055,7 +1055,7 @@ void ListBoxImpl::Append(const wxString& text, int type) {
     long count  = GETLB(id)->GetItemCount();
     long itemID  = GETLB(id)->InsertItem(count, wxEmptyString);
     GETLB(id)->SetItem(itemID, 1, text);
     long count  = GETLB(id)->GetItemCount();
     long itemID  = GETLB(id)->InsertItem(count, wxEmptyString);
     GETLB(id)->SetItem(itemID, 1, text);

-    maxStrWidth = wxMax(maxStrWidth, text.Length());
+    maxStrWidth = wxMax(maxStrWidth, text.length());

     if (type != -1) {
         wxCHECK_RET(imgTypeMap, wxT("Unexpected NULL imgTypeMap"));
         long idx = imgTypeMap->Item(type);
     if (type != -1) {
         wxCHECK_RET(imgTypeMap, wxT("Unexpected NULL imgTypeMap"));
         long idx = imgTypeMap->Item(type);


@@ -1065,7 +1065,7 @@ void ListBoxImpl::Append(const wxString& text, int type) {
 
 void ListBoxImpl::SetList(const char* list, char separator, char typesep) {
     GETLB(id)->Freeze();
 
 void ListBoxImpl::SetList(const char* list, char separator, char typesep) {
     GETLB(id)->Freeze();

-    Clear();    
+    Clear();

     wxStringTokenizer tkzr(stc2wx(list), (wxChar)separator);
     while ( tkzr.HasMoreTokens() ) {
         wxString token = tkzr.GetNextToken();
     wxStringTokenizer tkzr(stc2wx(list), (wxChar)separator);
     while ( tkzr.HasMoreTokens() ) {
         wxString token = tkzr.GetNextToken();


@@ -1396,9 +1396,3 @@ const wxWX2MBbuf wx2stc(const wxString& str)
 }
 
 #endif
 }
 
 #endif

-
-
-
-
-
-