[Git][wxwidgets/wxwidgets][master] 6 commits: Minor formatting fix

0 views
Skip to first unread message

Vadim Zeitlin (@_VZ_)

unread,
Aug 15, 2025, 8:59:52 AMAug 15
to wx-commi...@googlegroups.com

Vadim Zeitlin pushed to branch master at wxWidgets / wxWidgets

Commits:

  • ec29dbdc
    by Blake-Madden at 2025-08-04T05:36:12-04:00 
    Minor formatting fix
  • ba7b31ba
    by Blake-Madden at 2025-08-04T05:39:42-04:00 
    Explain the direction that Rotate goes
  • ea0a0187
    by Vadim Zeitlin at 2025-08-13T23:08:43+02:00 
    Fix wrong documentation of wxObjectDataPtr ctor

This ctor was wrongly documented back in cfa9866bf5 (revision
contributed by Utensil Candel, 2008-03-30) to call IncRef() on the
pointer passed to it but in fact it just takes ownership of it.

Closes #25692.
  • 74467930
    by Blake-Madden at 2025-08-13T23:09:53+02:00 
    Silence MSVC "possibly uninitialized" warning in WebP

Initialize variables to make it clear to the compiler that they always
have well-defined values.

Closes #25693.
  • cf38ba80
    by Stefan Ziegler at 2025-08-13T23:20:46+02:00 
    Allow handling drag and drop of CFSTR_FILECONTENTS with wxMSW

Allow the application to handle this and other similar data objects by
not giving an error if the index in the provided pformatetc object is 0.

Closes #25694.
  • 183b33e1
    by Vadim Zeitlin at 2025-08-13T23:27:49+02:00 
    Merge branch 'GCDocs' of github.com:Blake-Madden/wxWidgets

Minor improvements to wxGraphicsContext docs.

See #25680.

5 changed files:

Changes:

  • interface/wx/geometry.h
    ... ... @@ -229,7 +229,7 @@ public :
    229 229 
         The rectangle is either defined by the top left and bottom right corner,
    230 230 
         or by the top left corner and size.
    231 231
    232 
    -    A point is contained within the rectangle if left <= @c @c m_x < right
    232 
    +    A point is contained within the rectangle if left <= @c m_x < right
    233 233 
         and top <= @c m_y < bottom; thus, it is a half open interval.
    234 234
    235 235 
         @note wxRect2DDouble has subtle differences from wxRect in how its edge

  • interface/wx/graphics.h
    ... ... @@ -731,6 +731,8 @@ public:
    731 731 
             This can be useful for applying a tilt to your drawing
    732 732 
             commands or for drawing radial patterns.
    733 733
    734 
    +        @note A positive angle will rotate clockwise, negative counterclockwise.
    735 
    +
    734 736 
             @param angle
    735 737 
                 Rotation angle in radians, clockwise.
    736 738

  • interface/wx/object.h
    ... ... @@ -581,7 +581,8 @@ public:
    581 581 
             Constructor.
    582 582
    583 583 
             @a ptr is a pointer to the reference counted object to which this class points.
    584 
    -        If @a ptr is not null @b T::IncRef() will be called on the object.
    584 
    +        This object takes ownership of @a ptr, i.e.\ it will call T::DecRef()
    585 
    +        on it if it is non-null when this object is destroyed or reset.
    585 586 
         */
    586 587 
         wxObjectDataPtr(T* ptr = nullptr);
    587 588

  • src/common/imagwebp.cpp
    ... ... @@ -230,8 +230,8 @@ bool wxWEBPHandler::LoadAnimation(std::vector<wxWebPAnimationFrame>& frames, wxI
    230 230
    231 231 
         while (WebPAnimDecoderHasMoreFrames(decoder.get()))
    232 232 
         {
    233 
    -        uint8_t* buf;
    234 
    -        int timestamp;
    233 
    +        uint8_t* buf = nullptr;
    234 
    +        int timestamp = 0;
    235 235 
             WebPAnimDecoderGetNext(decoder.get(), &buf, &timestamp);
    236 236 
             if (buf == nullptr)
    237 237 
             {

  • src/msw/ole/dataobj.cpp
    ... ... @@ -609,6 +609,18 @@ STDMETHODIMP wxIDataObject::GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium)
    609 609 
             return hr;
    610 610 
         }
    611 611
    612 
    +    if ((pformatetcIn->tymed & (TYMED_HGLOBAL | TYMED_ISTREAM)) == TYMED_ISTREAM) {
    613 
    +        IStream* stream = nullptr;
    614 
    +        hr = CreateStreamOnHGlobal(pmedium->hGlobal, TRUE, &stream);
    615 
    +        if ( FAILED(hr) ) {
    616 
    +            GlobalFree(pmedium->hGlobal);
    617 
    +            return hr;
    618 
    +        }
    619 
    +        ZeroMemory(pmedium, sizeof(STGMEDIUM));
    620 
    +        pmedium->tymed = TYMED_ISTREAM;
    621 
    +        pmedium->pstm = stream;
    622 
    +    }
    623 
    +
    612 624 
         return S_OK;
    613 625 
     }
    614 626
    ... ... @@ -804,8 +816,8 @@ STDMETHODIMP wxIDataObject::QueryGetData(FORMATETC *pformatetc)
    804 816 
             return E_INVALIDARG;
    805 817 
         }
    806 818
    807 
    -    // the only one allowed by current COM implementation
    808 
    -    if ( pformatetc->lindex != -1 ) {
    819 
    +    // the only ones allowed by current COM implementation
    820 
    +    if (pformatetc->lindex != -1 && pformatetc->lindex != 0) {
    809 821 
             wxLogTrace(wxTRACE_OleCalls,
    810 822 
                        wxT("wxIDataObject::QueryGetData: bad lindex %ld"),
    811 823 
                        pformatetc->lindex);

Reply all
Reply to author
Forward
0 new messages