wxChartCtrl bettering

[ZinnJonas]

Hi,

I don't know, if this is the right place to post, but I found some little things, to change in wxSmithContribItems/wxChartCtrl.

It might be better to change:

Code Select Expand


Index: wxschart.cpp
===================================================================
--- wxschart.cpp (revision 6578)
+++ wxschart.cpp (working copy)
@@ -105,9 +105,9 @@
             else                       StyleCode.RemoveLast();

             #if wxCHECK_VERSION(2, 9, 0)
-            Codef(_T("%C(%W,%I,(wxChartStyle)(%s),%P,%S,%T);\n"),StyleCode.wx_str());
+            Codef(_T("%C(%W,%I,%s,%P,%S,%T);\n"),StyleCode.wx_str());
             #else
-            Codef(_T("%C(%W,%I,(wxChartStyle)(%s),%P,%S,%T);\n"),StyleCode.c_str());
+            Codef(_T("%C(%W,%I,%s,%P,%S,%T);\n"),StyleCode.c_str());
             #endif

             Codef(_T("{\n"));


Else you get a Compiler error, undefined "wxChartStyle"

To change chartctrl.cpp:

Code Select Expand


Index: chartctrl.cpp
===================================================================
--- chartctrl.cpp (revision 6578)
+++ chartctrl.cpp (working copy)
@@ -40,10 +40,10 @@
// XPMs
// ----------------------------------------------------------------------------

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+//#if !defined(__WXMSW__) && !defined(__WXPM__)
     #include "wx/chartart/chart_zin.xpm"
     #include "wx/chartart/chart_zot.xpm"
-#endif
+//#endif

// ----------------------------------------------------------------------------
// Consts
@@ -880,11 +880,11 @@
     {
//        s_loaded = TRUE; // set it to TRUE anyhow, we won't try again

-        #if defined(__WXMSW__) || defined(__WXPM__)
-            return wxBitmap(wxT("chart_zin_bmp"), wxBITMAP_TYPE_RESOURCE);
-        #else
+//        #if defined(__WXMSW__) || defined(__WXPM__)
+//            return wxBitmap(wxT("chart_zin_bmp"), wxBITMAP_TYPE_RESOURCE);
+//        #else
             return wxBitmap( chart_zin_xpm );
-        #endif
+//        #endif
     }

//    return s_bitmap;
@@ -905,11 +905,11 @@
     {
//        s_loaded = TRUE; // set it to TRUE anyhow, we won't try again

-        #if defined(__WXMSW__) || defined(__WXPM__)
-            return wxBitmap(wxT("chart_zot_bmp"), wxBITMAP_TYPE_RESOURCE);
-        #else
+//        #if defined(__WXMSW__) || defined(__WXPM__)
+//            return wxBitmap(wxT("chart_zot_bmp"), wxBITMAP_TYPE_RESOURCE);
+//        #else
             return wxBitmap( chart_zot_xpm );
-        #endif
+//        #endif
     }

//    return s_bitmap;


to see both Buttons correct in the Control, so you don't get the error, that
chart_zin_bmp and chart_zot_bmp wasn't found in the .rc file;D

Jonas