A fix for attribrute sorting, but it's still broken if there are

[wxWidgets.git] / utils / dialoged / src / edlist.cpp

diff --git a/utils/dialoged/src/edlist.cpp b/utils/dialoged/src/edlist.cpp
index 57ddca9959e292790cfe796e4c69f033d3ab48aa..205a6fd1536ad07137512c8f479e6168378c310f 100644 (file)
--- a/utils/dialoged/src/edlist.cpp
+++ b/utils/dialoged/src/edlist.cpp
@@ -41,8 +41,8 @@ BEGIN_EVENT_TABLE(wxResourceEditorControlList, wxListCtrl)
 END_EVENT_TABLE()
 
 wxResourceEditorControlList::wxResourceEditorControlList(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
 END_EVENT_TABLE()
 
 wxResourceEditorControlList::wxResourceEditorControlList(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size,

-        long style):
-     wxListCtrl(parent, id, pos, size, style), m_imageList(16, 16, TRUE)
+                                                         long style):
+wxListCtrl(parent, id, pos, size, style), m_imageList(16, 16, TRUE)

 {
     Initialize();
 }
 {
     Initialize();
 }


@@ -55,59 +55,82 @@ wxResourceEditorControlList::~wxResourceEditorControlList()
 // Load icons and add to the list
 void wxResourceEditorControlList::Initialize()
 {
 // Load icons and add to the list
 void wxResourceEditorControlList::Initialize()
 {

+#ifdef __WXMSW__

     wxIcon icon1("ARROW_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon1("ARROW_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon1);
-

     wxIcon icon2("BUTTON_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon2("BUTTON_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon2);
-

     wxIcon icon3("BMPBUTTON_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon3("BMPBUTTON_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon3);
-

     wxIcon icon4("STATICTEXT_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon4("STATICTEXT_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon4);
-

     wxIcon icon5("STATICBMP_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon5("STATICBMP_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon5);
-

     wxIcon icon6("STATICBOX_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon6("STATICBOX_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon6);
-

     wxIcon icon7("TEXTSING_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon7("TEXTSING_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon7);
-

     wxIcon icon8("TEXTMULT_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon8("TEXTMULT_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon8);
-

     wxIcon icon9("LISTBOX_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon9("LISTBOX_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon9);
-

     wxIcon icon10("CHOICE_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon10("CHOICE_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon10);
-

     wxIcon icon11("COMBOBOX_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon11("COMBOBOX_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon11);
-

     wxIcon icon12("CHECKBOX_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon12("CHECKBOX_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon12);
-

     wxIcon icon13("SLIDER_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon13("SLIDER_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon13);
-

     wxIcon icon14("GAUGE_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon14("GAUGE_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon14);
-

     wxIcon icon15("RADIOBOX_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon15("RADIOBOX_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon15);
-

     wxIcon icon16("RADIOBTN_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon16("RADIOBTN_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon16);
-

     wxIcon icon17("SCROLBAR_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon17("SCROLBAR_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

+#else
+    
+#include "bitmaps/arrow.xpm"
+    wxIcon icon1( arrow_xpm );
+#include "bitmaps/button.xpm"
+    wxIcon icon2( button_xpm );
+#include "bitmaps/bmpbuttn.xpm"
+    wxIcon icon3( bmpbuttn_xpm );
+#include "bitmaps/stattext.xpm"
+    wxIcon icon4( stattext_xpm );
+#include "bitmaps/statbmp.xpm"
+    wxIcon icon5( statbmp_xpm );
+#include "bitmaps/statbox.xpm"
+    wxIcon icon6( statbox_xpm );
+#include "bitmaps/textsing.xpm"
+    wxIcon icon7( textsing_xpm );
+#include "bitmaps/textmult.xpm"
+    wxIcon icon8( textmult_xpm );
+#include "bitmaps/listbox.xpm"
+    wxIcon icon9( listbox_xpm );
+#include "bitmaps/choice.xpm"
+    wxIcon icon10( choice_xpm );
+#include "bitmaps/combobox.xpm"
+    wxIcon icon11( combobox_xpm );
+#include "bitmaps/checkbox.xpm"
+    wxIcon icon12( checkbox_xpm );
+#include "bitmaps/slider.xpm"
+    wxIcon icon13( slider_xpm );
+#include "bitmaps/gauge.xpm"
+    wxIcon icon14( gauge_xpm );
+#include "bitmaps/radiobox.xpm"
+    wxIcon icon15( radiobox_xpm );
+#include "bitmaps/radiobtn.xpm"
+    wxIcon icon16( radiobtn_xpm );
+#include "bitmaps/scrolbar.xpm"
+    wxIcon icon17( scrolbar_xpm );
+#endif
+    
+    m_imageList.Add(icon1);
+    m_imageList.Add(icon2);
+    m_imageList.Add(icon3);
+    m_imageList.Add(icon4);
+    m_imageList.Add(icon5);
+    m_imageList.Add(icon6);
+    m_imageList.Add(icon7);
+    m_imageList.Add(icon8);
+    m_imageList.Add(icon9);
+    m_imageList.Add(icon10);
+    m_imageList.Add(icon11);
+    m_imageList.Add(icon12);
+    m_imageList.Add(icon13);
+    m_imageList.Add(icon14);
+    m_imageList.Add(icon15);
+    m_imageList.Add(icon16);

     m_imageList.Add(icon17);
     m_imageList.Add(icon17);

-
+    

     SetImageList(& m_imageList, wxIMAGE_LIST_SMALL);
     SetImageList(& m_imageList, wxIMAGE_LIST_SMALL);

-
+    

     long id = InsertItem(0,             "Pointer", 0);
     id = InsertItem(1,                  "wxButton", 1);
     id = InsertItem(2,                  "wxBitmapButton", 2);
     long id = InsertItem(0,             "Pointer", 0);
     id = InsertItem(1,                  "wxButton", 1);
     id = InsertItem(2,                  "wxBitmapButton", 2);


@@ -125,14 +148,14 @@ void wxResourceEditorControlList::Initialize()
     id = InsertItem(14,                  "wxRadioBox", 14);
     id = InsertItem(15,                  "wxRadioButton", 15);
     id = InsertItem(16,                  "wxScrollBar", 16);
     id = InsertItem(14,                  "wxRadioBox", 14);
     id = InsertItem(15,                  "wxRadioButton", 15);
     id = InsertItem(16,                  "wxScrollBar", 16);

-
-/*
+    
+    /*

     InsertItem(RESED_TREECTRL,          "wxTreeCtrl", 16);
     InsertItem(RESED_LISTCTRL,          "wxListCtrl", 17);
     InsertItem(RESED_SPINBUTTON,        "wxSpinButton", 18);
     InsertItem(RESED_TREECTRL,          "wxTreeCtrl", 16);
     InsertItem(RESED_LISTCTRL,          "wxListCtrl", 17);
     InsertItem(RESED_SPINBUTTON,        "wxSpinButton", 18);

-*/
-
-//    SetColumnWidth(-1, 80);
+    */
+    
+    //    SetColumnWidth(-1, 80);

 }
 
 // Get selection, or -1
 }
 
 // Get selection, or -1