Wx files working

wxheaders/wx/generic/calctrlg.h

@@ -14,6 +14,8 @@
 #include "wx/control.h"         // the base class
 #include "wx/dcclient.h"        // for wxPaintDC
 
+class WXDLLIMPEXP_FWD_CORE wxChoice;
+// Not used here any more, but still declared for backwards compatibility.
 class WXDLLIMPEXP_FWD_CORE wxComboBox;
 class WXDLLIMPEXP_FWD_CORE wxStaticText;
 class WXDLLIMPEXP_FWD_CORE wxSpinCtrl;
@@ -238,7 +240,8 @@ private:
     // show the correct controls
     void ShowCurrentControls();
 
-    // create the month combo and year spin controls
+    // create the month choice and year spin controls: the name is misleading
+    // (it should be called CreateMonthChoice()) but preserved for compatibility
     void CreateMonthComboBox();
     void CreateYearSpinCtrl();
 
@@ -268,7 +271,7 @@ private:
 
     // the subcontrols
     wxStaticText *m_staticMonth;
-    wxComboBox *m_comboMonth;
+    wxChoice *m_choiceMonth;
 
     wxStaticText *m_staticYear;
     wxSpinCtrl *m_spinYear;

wxheaders/wx/generic/grideditors.h

@@ -116,7 +116,8 @@ public:
     explicit wxGridCellNumberEditor(int min = -1, int max = -1)
         : wxGridCellTextEditor(),
           m_min(min),
-          m_max(max)
+          m_max(max),
+          m_value(0L)
     {
     }
 
@@ -213,6 +214,7 @@ public:
         : wxGridCellTextEditor(),
           m_width(width),
           m_precision(precision),
+          m_value(0.0),
           m_style(format)
     {
     }

wxheaders/wx/generic/private/drawbitmap.h

@@ -0,0 +1,41 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/generic/private/drawbitmap.h
+// Purpose:     Small helper for drawing images.
+// Author:      Vadim Zeitlin
+// Created:     2022-10-25
+// Copyright:   (c) 2022 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_GENERIC_PRIVATE_DRAWBITMAP_H_
+#define _WX_GENERIC_PRIVATE_DRAWBITMAP_H_
+
+#include "wx/dc.h"
+#include "wx/window.h"
+#include "wx/withimages.h"
+
+// Just a trivial wrapper for wxDC::DrawBitmap() using wxWithImages: this is
+// used in several places in the generic wxListCtrl and wxTreeCtrl code.
+inline void
+wxDrawImageBitmap(wxWindow* window,
+                  const wxWithImages& images,
+                  int image,
+                  wxDC& dc,
+                  int x,
+                  int y)
+{
+    dc.DrawBitmap(images.GetImageBitmapFor(window, image),
+                  x, y,
+                  true /* use mask */);
+}
+
+// Overload for the controls deriving from both wxWindow and wxWithImages, as
+// both wxListCtrl and wxTreeCtrl do.
+template <typename T>
+inline void
+wxDrawImageBitmap(T* window, int image, wxDC& dc, int x, int y)
+{
+    wxDrawImageBitmap(window, *window, image, dc, x, y);
+}
+
+#endif // _WX_GENERIC_PRIVATE_DRAWBITMAP_H_

wxheaders/wx/generic/private/listctrl.h

@@ -640,7 +640,7 @@ public:
     void DrawImage( int index, wxDC *dc, int x, int y );
     void GetImageSize( int index, int &width, int &height ) const;
 
-    void SetImageList( wxImageList *imageList, int which );
+    void SetImages( wxWithImages *images, const int which );
     void SetItemSpacing( int spacing, bool isSmall = false );
     int GetItemSpacing( bool isSmall = false );
 
@@ -694,8 +694,9 @@ public:
         SetItem( info );
     }
 
-    wxImageList* GetSmallImageList() const
-        { return m_small_image_list; }
+    wxWithImages* GetSmallImages() const
+        { return m_small_images; }
+
 
     // set the scrollbars and update the positions of the items
     void RecalculatePositions();
@@ -811,8 +812,9 @@ protected:
     bool                 m_dirty;
 
     wxColour            *m_highlightColour;
-    wxImageList         *m_small_image_list;
-    wxImageList         *m_normal_image_list;
+    wxWithImages        *m_small_images;
+    wxWithImages        *m_normal_images;
+
     int                  m_small_spacing;
     int                  m_normal_spacing;
     bool                 m_hasFocus;