From 91292545745e71c2d2be63aa8596d88740b687ff Mon Sep 17 00:00:00 2001
From: Jouk <joukj@hrem.nano.tudelft.nl>
Date: Thu, 24 Feb 2022 09:59:34 +0100
Subject: [PATCH] wxGTK1 build fixes after the recent changes

Update wxMenuItem to use wxBitmapBundle and wxSpinCtrl use
DoSetIncrement() in wxGTK1 just as it was done in wxGTK.

Closes #22157.
---
 include/wx/gtk1/menuitem.h |  6 +++---
 include/wx/gtk1/spinctrl.h |  4 ++++
 src/gtk1/menu.cpp          |  7 ++++++-
 src/gtk1/spinctrl.cpp      | 16 ++++++++++++++++
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/include/wx/gtk1/menuitem.h b/include/wx/gtk1/menuitem.h
index 9085e91b97..7ae48cedb7 100644
--- a/include/wx/gtk1/menuitem.h
+++ b/include/wx/gtk1/menuitem.h
@@ -32,8 +32,8 @@ public:
     virtual void Enable( bool enable = TRUE );
     virtual void Check( bool check = TRUE );
     virtual bool IsChecked() const;
-    virtual void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
-    virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
+    virtual void SetBitmap(const wxBitmapBundle& bitmap) { m_bitmap = bitmap; }
+    virtual wxBitmap GetBitmap() const;
 
 #if wxUSE_ACCEL
     virtual wxAcceleratorEntry *GetAccel() const;
@@ -65,7 +65,7 @@ private:
     void DoSetText(const wxString& text);
 
     wxString  m_hotKey;
-    wxBitmap  m_bitmap; // Bitmap for menuitem, if any
+    wxBitmapBundle  m_bitmap; // Bitmap for menuitem, if any
 
     GtkWidget *m_menuItem;  // GtkMenuItem
     GtkWidget* m_labelWidget; // Label widget
diff --git a/include/wx/gtk1/spinctrl.h b/include/wx/gtk1/spinctrl.h
index f037be2ebe..f3cc443439 100644
--- a/include/wx/gtk1/spinctrl.h
+++ b/include/wx/gtk1/spinctrl.h
@@ -65,6 +65,10 @@ public:
     void GtkDisableEvents();
     void GtkEnableEvents();
 
+    void DoSetIncrement(double inc);
+    void SetIncrement(int inc) { DoSetIncrement(inc); }
+    double DoGetIncrement() const;
+
     GtkAdjustment  *m_adjust;
     float           m_oldPos;
 
diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 1c2a76a344..048a17fa1a 100644
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -870,6 +870,11 @@ wxAcceleratorEntry *wxMenuItem::GetAccel() const
 
 #endif // wxUSE_ACCEL
 
+wxBitmap wxMenuItem::GetBitmap() const
+{
+   return GetBitmapFromBundle(m_bitmap);
+}
+
 void wxMenuItem::Check( bool check )
 {
     wxCHECK_RET( m_menuItem, wxT("invalid menu item") );
@@ -978,7 +983,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
     else if (mitem->GetBitmap().IsOk())
     {
         text = mitem->wxMenuItemBase::GetItemLabel();
-        const wxBitmap *bitmap = &mitem->GetBitmap();
+        const wxBitmap bitmap = mitem->GetBitmap();
 
         // TODO
         wxUnusedVar(bitmap);
diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp
index 0483b21d33..6f66da5ea6 100644
--- a/src/gtk1/spinctrl.cpp
+++ b/src/gtk1/spinctrl.cpp
@@ -165,6 +165,22 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
     return true;
 }
 
+void wxSpinCtrl::DoSetIncrement(double inc)
+{
+    wxCHECK_RET( m_widget, "invalid spin button" );
+
+    GtkAdjustment* adj = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(m_widget));
+    adj->step_increment = inc;
+}
+
+double wxSpinCtrl::DoGetIncrement() const
+{
+    wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
+
+    GtkAdjustment* adj = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(m_widget));
+    return adj->step_increment;
+}
+
 void wxSpinCtrl::GtkDisableEvents()
 {
     gtk_signal_disconnect_by_func( GTK_OBJECT(m_adjust),