[Git][wxwidgets/wxwidgets][master] Fix compilation with WXWIN_COMPATIBILITY_3_2==0

2 views
Skip to first unread message

Vadim Zeitlin (@_VZ_)

unread,
Jan 29, 2026, 4:38:12 AMJan 29
to wx-commi...@googlegroups.com

Vadim Zeitlin pushed to branch master at wxWidgets / wxWidgets

Commits:

  • f838eb00
    by Vadim Zeitlin at 2026-01-29T10:27:35+01:00
    Fix compilation with WXWIN_COMPATIBILITY_3_2==0
    
    Don't define wxPropertyGrid::RescaleBitmap() in this case.
    
    This should have been part of 2d7a886cab (Deprecate and stop using
    wxPropertyGrid::RescaleBitmap(), 2026-01-28).
    

1 changed file:

Changes:

  • src/propgrid/propgrid.cpp
    ... ... @@ -1858,6 +1858,7 @@ bool wxPropertyGrid::IsSmallScreen()
    1858 1858
     
    
    1859 1859
     // -----------------------------------------------------------------------
    
    1860 1860
     
    
    1861
    +#if WXWIN_COMPATIBILITY_3_2
    
    1861 1862
     // static
    
    1862 1863
     wxBitmap wxPropertyGrid::RescaleBitmap(const wxBitmap& srcBmp,
    
    1863 1864
                                            double scaleX, double scaleY)
    
    ... ... @@ -1870,6 +1871,7 @@ wxBitmap wxPropertyGrid::RescaleBitmap(const wxBitmap& srcBmp,
    1870 1871
         wxBitmap::Rescale(dstBmp, size);
    
    1871 1872
         return dstBmp;
    
    1872 1873
     }
    
    1874
    +#endif // WXWIN_COMPATIBILITY_3_2
    
    1873 1875
     
    
    1874 1876
     // -----------------------------------------------------------------------
    
    1875 1877
     
    


View it on GitLab.
You're receiving this email because of your account on gitlab.com. Manage all notifications · Help Notification message regarding https://gitlab.com/wxwidgets/wxwidgets/-/commit/f838eb00bae4e3799de6f7932e49695e4c0f32ac at 1769679487

Reply all
Reply to author
Forward
0 new messages