Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

[wxWidgets.git] / src / generic / editlbox.cpp

diff --git a/src/generic/editlbox.cpp b/src/generic/editlbox.cpp
index 26512e0735070fb78409a4d90e67e2d96359a030..cf5e5d1913d0e1dc70dd833887d0f1d1de0457f3 100644 (file)
--- a/src/generic/editlbox.cpp
+++ b/src/generic/editlbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        editlbox.cpp
+// Name:        src/generic/editlbox.cpp

 // Purpose:     ListBox with editable items
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Purpose:     ListBox with editable items
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$


@@ -30,9 +30,9 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-const wxChar wxEditableListBoxNameStr[] = wxT("editableListBox");
+const char wxEditableListBoxNameStr[] = "editableListBox";

 
 

-static const char * eledit_xpm[] = {
+static const char* const eledit_xpm[] = {

 "16 16 3 1",
 "   c None",
 ".  c #000000",
 "16 16 3 1",
 "   c None",
 ".  c #000000",


@@ -54,7 +54,7 @@ static const char * eledit_xpm[] = {
 "                ",
 "                "};
 
 "                ",
 "                "};
 

-static const char * elnew_xpm[] = {
+static const char* const elnew_xpm[] = {

 "16 16 5 1",
 "   c None",
 ".  c #7F7F7F",
 "16 16 5 1",
 "   c None",
 ".  c #7F7F7F",


@@ -78,7 +78,7 @@ static const char * elnew_xpm[] = {
 "                ",
 "                "};
 
 "                ",
 "                "};
 

-static const char * eldel_xpm[] = {
+static const char* const eldel_xpm[] = {

 "16 16 3 1",
 "   c None",
 ".  c #7F0000",
 "16 16 3 1",
 "   c None",
 ".  c #7F0000",


@@ -100,7 +100,7 @@ static const char * eldel_xpm[] = {
 "   .         .  ",
 "                "};
 
 "   .         .  ",
 "                "};
 

-static const char * eldown_xpm[] = {
+static const char* const eldown_xpm[] = {

 "16 16 2 1",
 "   c None",
 ".  c #000000",
 "16 16 2 1",
 "   c None",
 ".  c #000000",


@@ -121,7 +121,7 @@ static const char * eldown_xpm[] = {
 "                ",
 "                "};
 
 "                ",
 "                "};
 

-static const char * elup_xpm[] = {
+static const char* const elup_xpm[] = {

 "16 16 2 1",
 "   c None",
 ".  c #000000",
 "16 16 2 1",
 "   c None",
 ".  c #000000",


@@ -160,7 +160,7 @@ public:
 
     void CreateColumns()
     {
 
     void CreateColumns()
     {

-        InsertColumn(0, _T("item"));
+        InsertColumn(0, wxT("item"));

         SizeColumns();
     }
 
         SizeColumns();
     }
 


@@ -172,6 +172,7 @@ public:
 #else
          w -= 2*wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
 #endif
 #else
          w -= 2*wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
 #endif

+         if (w < 0) w = 0;

          SetColumnWidth(0, w);
     }
 
          SetColumnWidth(0, w);
     }
 


@@ -197,12 +198,12 @@ IMPLEMENT_CLASS(wxEditableListBox, wxPanel)
 
 // NB: generate the IDs at runtime to avoid conflict with XRCID values,
 //     they could cause XRCCTRL() failures in XRC-based dialogs
 
 // NB: generate the IDs at runtime to avoid conflict with XRCID values,
 //     they could cause XRCCTRL() failures in XRC-based dialogs

-const int wxID_ELB_DELETE = wxWindow::NewControlId();
-const int wxID_ELB_EDIT = wxWindow::NewControlId();
-const int wxID_ELB_NEW = wxWindow::NewControlId();
-const int wxID_ELB_UP = wxWindow::NewControlId();
-const int wxID_ELB_DOWN = wxWindow::NewControlId();
-const int wxID_ELB_LISTCTRL = wxWindow::NewControlId();
+const wxWindowIDRef wxID_ELB_DELETE = wxWindow::NewControlId();
+const wxWindowIDRef wxID_ELB_EDIT = wxWindow::NewControlId();
+const wxWindowIDRef wxID_ELB_NEW = wxWindow::NewControlId();
+const wxWindowIDRef wxID_ELB_UP = wxWindow::NewControlId();
+const wxWindowIDRef wxID_ELB_DOWN = wxWindow::NewControlId();
+const wxWindowIDRef wxID_ELB_LISTCTRL = wxWindow::NewControlId();

 
 BEGIN_EVENT_TABLE(wxEditableListBox, wxPanel)
     EVT_LIST_ITEM_SELECTED(wxID_ELB_LISTCTRL, wxEditableListBox::OnItemSelected)
 
 BEGIN_EVENT_TABLE(wxEditableListBox, wxPanel)
     EVT_LIST_ITEM_SELECTED(wxID_ELB_LISTCTRL, wxEditableListBox::OnItemSelected)