From 3dc16a7419a69dfda8b23510531dceac15dc8854 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 6 Dec 2018 03:19:42 +0100 Subject: [PATCH 01/77] Compute wxDCImpl::m_mm_to_pix_[xy] on demand If nothing else, this avoids 2 calls to each of wxGetDisplaySize() and wxGetDisplaySizeMM() on each and every wxGCDC construction which are completely unnecessary as wxGCDCImpl uses its own hardcoded resolution of 72 DPI, as do some other classes deriving from wxDCImpl. And even for the classes which do compute these fields using the display resolution, it may still be unnecessary to do it as they can be never used if neither GetSizeMM() nor SetLogicalScale() are called on the corresponding wxDC object. Finally, this is more than an optimization as when using Cairo-based wxGCDC without display (which is explicitly supported), calling wxGetDisplaySize() simply doesn't work at all. --- include/wx/dc.h | 19 ++++++++++++++++--- src/common/dcbase.cpp | 36 +++++++++++++++++++++++++++--------- src/common/dcgraph.cpp | 4 ++-- src/common/dcsvg.cpp | 4 ++-- src/dfb/dc.cpp | 8 ++++---- src/gtk/dc.cpp | 4 ++-- src/gtk/dcclient.cpp | 2 +- src/gtk1/dc.cpp | 4 ++-- src/gtk1/dcclient.cpp | 2 +- src/motif/dc.cpp | 4 ++-- src/x11/dc.cpp | 4 ++-- 11 files changed, 61 insertions(+), 30 deletions(-) diff --git a/include/wx/dc.h b/include/wx/dc.h index a34a73b698..8d445e9f6b 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -686,6 +686,16 @@ protected: // for rendering on higher-resolution DCs such as printer ones static float GetFontPointSizeAdjustment(float dpi); + // Return the number of pixels per mm in the horizontal and vertical + // directions, respectively. + // + // If the physical size of the DC is not known, or doesn't make sense, as + // for a SVG DC, for example, a fixed value corresponding to the standard + // DPI is used. + double GetMMToPXx() const; + double GetMMToPXy() const; + + // window on which the DC draws or NULL wxWindow *m_window; @@ -715,9 +725,12 @@ protected: double m_contentScaleFactor; // used by high resolution displays (retina) - // what is a mm on a screen you don't know the size of? - double m_mm_to_pix_x, - m_mm_to_pix_y; + // Pixel per mm in horizontal and vertical directions. + // + // These variables are computed on demand by GetMMToPX[xy]() functions, + // don't access them directly other than for assigning to them. + mutable double m_mm_to_pix_x, + m_mm_to_pix_y; // bounding and clipping boxes wxCoord m_minX, m_minY, m_maxX, m_maxY; // Bounding box is stored in device units. diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp index 8b070995d8..47000e5f1f 100644 --- a/src/common/dcbase.cpp +++ b/src/common/dcbase.cpp @@ -331,6 +331,7 @@ wxDCImpl::wxDCImpl( wxDC *owner ) , m_scaleX(1.0), m_scaleY(1.0) , m_signX(1), m_signY(1) , m_contentScaleFactor(1) + , m_mm_to_pix_x(0.0), m_mm_to_pix_y(0.0) , m_minX(0), m_minY(0), m_maxX(0), m_maxY(0) , m_clipX1(0), m_clipY1(0), m_clipX2(0), m_clipY2(0) , m_logicalFunction(wxCOPY) @@ -348,11 +349,6 @@ wxDCImpl::wxDCImpl( wxDC *owner ) #endif // wxUSE_PALETTE { m_owner = owner; - - m_mm_to_pix_x = (double)wxGetDisplaySize().GetWidth() / - (double)wxGetDisplaySizeMM().GetWidth(); - m_mm_to_pix_y = (double)wxGetDisplaySize().GetHeight() / - (double)wxGetDisplaySizeMM().GetHeight(); } wxDCImpl::~wxDCImpl() @@ -517,16 +513,16 @@ void wxDCImpl::SetMapMode( wxMappingMode mode ) switch (mode) { case wxMM_TWIPS: - SetLogicalScale( twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y ); + SetLogicalScale( twips2mm*GetMMToPXx(), twips2mm*GetMMToPXy() ); break; case wxMM_POINTS: - SetLogicalScale( pt2mm*m_mm_to_pix_x, pt2mm*m_mm_to_pix_y ); + SetLogicalScale( pt2mm*GetMMToPXx(), pt2mm*GetMMToPXy() ); break; case wxMM_METRIC: - SetLogicalScale( m_mm_to_pix_x, m_mm_to_pix_y ); + SetLogicalScale( GetMMToPXx(), GetMMToPXy() ); break; case wxMM_LOMETRIC: - SetLogicalScale( m_mm_to_pix_x/10.0, m_mm_to_pix_y/10.0 ); + SetLogicalScale( GetMMToPXx()/10.0, GetMMToPXy()/10.0 ); break; default: case wxMM_TEXT: @@ -1441,3 +1437,25 @@ float wxDCImpl::GetFontPointSizeAdjustment(float dpi) const wxSize screenPPI = wxGetDisplayPPI(); return float(screenPPI.y) / dpi; } + +double wxDCImpl::GetMMToPXx() const +{ + if ( wxIsNullDouble(m_mm_to_pix_x) ) + { + m_mm_to_pix_x = (double)wxGetDisplaySize().GetWidth() / + (double)wxGetDisplaySizeMM().GetWidth(); + } + + return m_mm_to_pix_x; +} + +double wxDCImpl::GetMMToPXy() const +{ + if ( wxIsNullDouble(m_mm_to_pix_x) ) + { + m_mm_to_pix_y = (double)wxGetDisplaySize().GetHeight() / + (double)wxGetDisplaySizeMM().GetHeight(); + } + + return m_mm_to_pix_y; +} diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp index 5812e393f3..832eb2bdc6 100644 --- a/src/common/dcgraph.cpp +++ b/src/common/dcgraph.cpp @@ -390,9 +390,9 @@ void wxGCDCImpl::DoGetSizeMM( int* width, int* height ) const GetOwner()->GetSize( &w, &h ); if (width) - *width = long( double(w) / (m_scaleX * m_mm_to_pix_x) ); + *width = long( double(w) / (m_scaleX * GetMMToPXx()) ); if (height) - *height = long( double(h) / (m_scaleY * m_mm_to_pix_y) ); + *height = long( double(h) / (m_scaleY * GetMMToPXy()) ); } void wxGCDCImpl::SetTextForeground( const wxColour &col ) diff --git a/src/common/dcsvg.cpp b/src/common/dcsvg.cpp index 2913548a12..ff212b8829 100644 --- a/src/common/dcsvg.cpp +++ b/src/common/dcsvg.cpp @@ -442,10 +442,10 @@ wxSVGFileDCImpl::~wxSVGFileDCImpl() void wxSVGFileDCImpl::DoGetSizeMM(int *width, int *height) const { if (width) - *width = wxRound( (double)m_width / m_mm_to_pix_x ); + *width = wxRound( (double)m_width / GetMMToPXx() ); if (height) - *height = wxRound( (double)m_height / m_mm_to_pix_y ); + *height = wxRound( (double)m_height / GetMMToPXy() ); } wxSize wxSVGFileDCImpl::GetPPI() const diff --git a/src/dfb/dc.cpp b/src/dfb/dc.cpp index a65f9bca0b..241bcd0562 100644 --- a/src/dfb/dc.cpp +++ b/src/dfb/dc.cpp @@ -563,15 +563,15 @@ void wxDFBDCImpl::DoGetSizeMM(int *width, int *height) const int w = 0; int h = 0; GetSize(&w, &h); - if ( width ) *width = int(double(w) / (m_userScaleX*m_mm_to_pix_x)); - if ( height ) *height = int(double(h) / (m_userScaleY*m_mm_to_pix_y)); + if ( width ) *width = int(double(w) / (m_userScaleX*GetMMToPXx())); + if ( height ) *height = int(double(h) / (m_userScaleY*GetMMToPXy())); } wxSize wxDFBDCImpl::GetPPI() const { #warning "move this to common code?" - return wxSize(int(double(m_mm_to_pix_x) * inches2mm), - int(double(m_mm_to_pix_y) * inches2mm)); + return wxSize(int(double(GetMMToPXx()) * inches2mm), + int(double(GetMMToPXy()) * inches2mm)); } diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp index a41910ac32..016c7cd4de 100644 --- a/src/gtk/dc.cpp +++ b/src/gtk/dc.cpp @@ -506,8 +506,8 @@ void wxGTKDCImpl::DoGetSizeMM( int* width, int* height ) const int w = 0; int h = 0; GetOwner()->GetSize( &w, &h ); - if (width) *width = int( double(w) / (m_userScaleX*m_mm_to_pix_x) ); - if (height) *height = int( double(h) / (m_userScaleY*m_mm_to_pix_y) ); + if (width) *width = int( double(w) / (m_userScaleX*GetMMToPXx()) ); + if (height) *height = int( double(h) / (m_userScaleY*GetMMToPXy()) ); } // Resolution in pixels per logical inch diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp index 52349d0e0a..feea364099 100644 --- a/src/gtk/dcclient.cpp +++ b/src/gtk/dcclient.cpp @@ -2072,7 +2072,7 @@ void wxWindowDCImpl::ComputeScaleAndOrigin() // Resolution in pixels per logical inch wxSize wxWindowDCImpl::GetPPI() const { - return wxSize( (int) (m_mm_to_pix_x * 25.4 + 0.5), (int) (m_mm_to_pix_y * 25.4 + 0.5)); + return wxSize( (int) (GetMMToPXx() * 25.4 + 0.5), (int) (GetMMToPXy() * 25.4 + 0.5)); } int wxWindowDCImpl::GetDepth() const diff --git a/src/gtk1/dc.cpp b/src/gtk1/dc.cpp index 7c75e571f2..77f130450c 100644 --- a/src/gtk1/dc.cpp +++ b/src/gtk1/dc.cpp @@ -50,8 +50,8 @@ void wxGTKDCImpl::DoGetSizeMM( int* width, int* height ) const int w = 0; int h = 0; GetSize( &w, &h ); - if (width) *width = int( double(w) / (m_userScaleX*m_mm_to_pix_x) ); - if (height) *height = int( double(h) / (m_userScaleY*m_mm_to_pix_y) ); + if (width) *width = int( double(w) / (m_userScaleX*GetMMToPXx()) ); + if (height) *height = int( double(h) / (m_userScaleY*GetMMToPXy()) ); } // Resolution in pixels per logical inch diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp index 623f049e72..4d3e9d120a 100644 --- a/src/gtk1/dcclient.cpp +++ b/src/gtk1/dcclient.cpp @@ -2113,7 +2113,7 @@ void wxWindowDCImpl::ComputeScaleAndOrigin() // Resolution in pixels per logical inch wxSize wxWindowDCImpl::GetPPI() const { - return wxSize( (int) (m_mm_to_pix_x * 25.4 + 0.5), (int) (m_mm_to_pix_y * 25.4 + 0.5)); + return wxSize( (int) (GetMMToPXx() * 25.4 + 0.5), (int) (GetMMToPXy() * 25.4 + 0.5)); } int wxWindowDCImpl::GetDepth() const diff --git a/src/motif/dc.cpp b/src/motif/dc.cpp index 908c8f76d1..c79c4eb07d 100644 --- a/src/motif/dc.cpp +++ b/src/motif/dc.cpp @@ -87,9 +87,9 @@ void wxMotifDCImpl::DoGetSizeMM( int* width, int* height ) const GetSize( &w, &h ); if ( width ) - *width = int( double(w) / (m_scaleX*m_mm_to_pix_x) ); + *width = int( double(w) / (m_scaleX*GetMMToPXx()) ); if ( height ) - *height = int( double(h) / (m_scaleY*m_mm_to_pix_y) ); + *height = int( double(h) / (m_scaleY*GetMMToPXy()) ); } // Resolution in pixels per logical inch diff --git a/src/x11/dc.cpp b/src/x11/dc.cpp index 888f15eb58..41e39ef80e 100644 --- a/src/x11/dc.cpp +++ b/src/x11/dc.cpp @@ -51,9 +51,9 @@ void wxX11DCImpl::DoGetSizeMM( int* width, int* height ) const DoGetSize( &w, &h ); if ( width ) - *width = int( double(w) / (m_scaleX*m_mm_to_pix_x) ); + *width = int( double(w) / (m_scaleX*GetMMToPXx()) ); if ( height ) - *height = int( double(h) / (m_scaleY*m_mm_to_pix_y) ); + *height = int( double(h) / (m_scaleY*GetMMToPXy()) ); } // Resolution in pixels per logical inch From 54e9150157fe89fcf6dea78bebecd40540d82ced Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 5 Dec 2018 23:39:00 +0100 Subject: [PATCH 02/77] Remove redundant wxDFBDCImpl::m_mm_to_pix_[xy] members The base class already has exactly the same members, so just use them instead. No real changes, just avoid (or at least reduce) confusion. --- include/wx/dfb/dc.h | 2 -- src/dfb/dc.cpp | 5 ----- 2 files changed, 7 deletions(-) diff --git a/include/wx/dfb/dc.h b/include/wx/dfb/dc.h index 141224ba68..4dac548d98 100644 --- a/include/wx/dfb/dc.h +++ b/include/wx/dfb/dc.h @@ -157,8 +157,6 @@ private: protected: wxIDirectFBSurfacePtr m_surface; - double m_mm_to_pix_x, m_mm_to_pix_y; - friend class WXDLLIMPEXP_FWD_CORE wxOverlayImpl; // for Init wxDECLARE_ABSTRACT_CLASS(wxDFBDCImpl); diff --git a/src/dfb/dc.cpp b/src/dfb/dc.cpp index 241bcd0562..b718de4c98 100644 --- a/src/dfb/dc.cpp +++ b/src/dfb/dc.cpp @@ -51,11 +51,6 @@ void wxDFBDCImpl::DFBInit(const wxIDirectFBSurfacePtr& surface) wxCHECK_RET( surface != NULL, "invalid surface" ); - m_mm_to_pix_x = (double)wxGetDisplaySize().GetWidth() / - (double)wxGetDisplaySizeMM().GetWidth(); - m_mm_to_pix_y = (double)wxGetDisplaySize().GetHeight() / - (double)wxGetDisplaySizeMM().GetHeight(); - SetFont(DEFAULT_FONT); SetPen(DEFAULT_PEN); SetBrush(DEFAULT_BRUSH); From 507e331eb15bb8c3b043d9ce327db1d5494cfe9d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 6 Dec 2018 03:40:49 +0100 Subject: [PATCH 03/77] Improve creating wxGCDC from an existing wxGraphicsContext Avoid creating a default wxGraphicsContext unnecessarily, only to immediately delete it and replace it with the provided one. This was at best unnecessary and at worst resulted in a crash if the default context couldn't be created, as happened on a headless system (where wxImage-based wxGraphicsContext can still be created successfully). --- include/wx/dcgraph.h | 4 ++++ src/common/dcgraph.cpp | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h index 9a11a19ce4..b75d715c7b 100644 --- a/include/wx/dcgraph.h +++ b/include/wx/dcgraph.h @@ -60,6 +60,10 @@ public: #if defined(__WXMSW__) && wxUSE_ENH_METAFILE wxGCDCImpl( wxDC *owner, const wxEnhMetaFileDC& dc ); #endif + + // Ctor using an existing graphics context given to wxGCDC ctor. + wxGCDCImpl(wxDC *owner, wxGraphicsContext* context); + wxGCDCImpl( wxDC *owner ); virtual ~wxGCDCImpl(); diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp index 832eb2bdc6..802ba8bf6a 100644 --- a/src/common/dcgraph.cpp +++ b/src/common/dcgraph.cpp @@ -106,9 +106,8 @@ wxGCDC::wxGCDC(const wxEnhMetaFileDC& dc) #endif wxGCDC::wxGCDC(wxGraphicsContext* context) : - wxDC( new wxGCDCImpl( this ) ) + wxDC(new wxGCDCImpl(this, context)) { - SetGraphicsContext(context); } wxGCDC::wxGCDC() : @@ -122,6 +121,12 @@ wxGCDC::~wxGCDC() wxIMPLEMENT_ABSTRACT_CLASS(wxGCDCImpl, wxDCImpl); +wxGCDCImpl::wxGCDCImpl(wxDC *owner, wxGraphicsContext* context) : + wxDCImpl(owner) +{ + Init(context); +} + wxGCDCImpl::wxGCDCImpl( wxDC *owner ) : wxDCImpl( owner ) { From aa6a8fbdf0983f48065a4feb15330c210b34ac0f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 6 Dec 2018 03:43:37 +0100 Subject: [PATCH 04/77] Document that wxGCDC takes ownership of the provided context This is a rather important detail which the documentation completely forgot to mention. --- interface/wx/dcgraph.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/interface/wx/dcgraph.h b/interface/wx/dcgraph.h index c60a00e7e0..ed2d01a9c1 100644 --- a/interface/wx/dcgraph.h +++ b/interface/wx/dcgraph.h @@ -40,6 +40,10 @@ public: /** Construct a wxGCDC from an existing graphics context. + + Note that this object takes ownership of @a context and will delete it + when it is destroyed or when SetGraphicsContext() is called with a + different context object. */ wxGCDC(wxGraphicsContext* context); @@ -64,8 +68,11 @@ public: /** Set the graphics context to be used for this wxGCDC. + + Note that this object takes ownership of @a context and will delete it when + it is destroyed or when SetGraphicsContext() is called again. */ - void SetGraphicsContext( wxGraphicsContext* ctx ); + void SetGraphicsContext(wxGraphicsContext* context); }; From 2d18aaf58a1b5c6d6fe9960f282d478e392a5c31 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 6 Dec 2018 20:48:32 +0100 Subject: [PATCH 05/77] Move check for mouse button down events in wxDataViewMainWindow No real changes, just prepare for the next commit. --- src/generic/datavgen.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 448a58bf5b..f5c60b3953 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -4525,14 +4525,6 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) return; } - if(event.ButtonDown()) - { - // Not skipping button down events would prevent the system from - // setting focus to this window as most (all?) of them do by default, - // so skip it to enable default handling. - event.Skip(); - } - int x = event.GetX(); int y = event.GetY(); m_owner->CalcUnscrolledPosition( x, y, &x, &y ); @@ -4560,6 +4552,14 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) const unsigned int current = GetLineAt( y ); const wxDataViewItem item = GetItemByRow(current); + if(event.ButtonDown()) + { + // Not skipping button down events would prevent the system from + // setting focus to this window as most (all?) of them do by default, + // so skip it to enable default handling. + event.Skip(); + } + // Handle right clicking here, before everything else as context menu // events should be sent even when we click outside of any item, unlike all // the other ones. From da612f02b5a8f2a8a8f8832dd12edd5a199cb066 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 6 Dec 2018 22:53:28 +0100 Subject: [PATCH 06/77] Stop editing in generic wxDataViewCtrl when any button is pressed Previously, the editor was hidden if the left mouse button was pressed, but not for the right (or any other) button, which could result in a confusing situation when a user could select a command from a context menu shown from the corresponding event handler and start editing another item while the current one was still being edited too. --- src/generic/datavgen.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index f5c60b3953..f94700b072 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -4558,6 +4558,12 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) // setting focus to this window as most (all?) of them do by default, // so skip it to enable default handling. event.Skip(); + + // Also stop editing if any mouse button is pressed: this is not really + // necessary for the left button, as it would result in a focus loss + // that would make the editor close anyhow, but we do need to do it for + // the other ones and it does no harm to do it for the left one too. + FinishEditing(); } // Handle right clicking here, before everything else as context menu From dc1aa3097c15868d124b947fae7b5dc91f350edc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 6 Dec 2018 22:55:42 +0100 Subject: [PATCH 07/77] Avoid warnings on right click in GTK wxDataViewCtrl while editing The code handling right button click used the path of the item under mouse without checking if there was any item, resulting in GTK+ warnings due to the use of an invalid item. Simply add a check for the item validity: we definitely don't want to select it if it's invalid anyhow. --- src/gtk/dataview.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index d2c1abf352..6a7811cf1d 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -4591,11 +4591,14 @@ gtk_dataview_button_press_callback( GtkWidget *WXUNUSED(widget), // If the right click is on an item that isn't selected, select it, as is // commonly done. Do not do it if the item under mouse is already selected, // because it could be a part of multi-item selection. - GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dv->GtkGetTreeView())); - if ( !gtk_tree_selection_path_is_selected(selection, path) ) + if ( path ) { - gtk_tree_selection_unselect_all(selection); - gtk_tree_selection_select_path(selection, path); + GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dv->GtkGetTreeView())); + if ( !gtk_tree_selection_path_is_selected(selection, path) ) + { + gtk_tree_selection_unselect_all(selection); + gtk_tree_selection_select_path(selection, path); + } } wxDataViewEvent From aee926f2d54b40db8f66217a7b69074f0d86bfcd Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 7 Dec 2018 14:52:51 +0100 Subject: [PATCH 08/77] Make wxVector::reverse_iterator satisfy RandomAccessIterator RandomAccessIterator requirements include LessThanComparable, so implement the missing comparison operators for this class, as well as for const_reverse_iterator. This also fixes compilation problems with MSVS 2013 in debug mode, where the CRT uses these operators to check the iterators correctness. See https://github.com/wxWidgets/wxWidgets/pull/1048 --- include/wx/vector.h | 16 ++++++++++++++++ tests/vectors/vectors.cpp | 7 +++++++ 2 files changed, 23 insertions(+) diff --git a/include/wx/vector.h b/include/wx/vector.h index 113157875c..25067081b4 100644 --- a/include/wx/vector.h +++ b/include/wx/vector.h @@ -219,6 +219,14 @@ public: { return m_ptr == it.m_ptr; } bool operator !=(const reverse_iterator& it) const { return m_ptr != it.m_ptr; } + bool operator<(const reverse_iterator& it) const + { return m_ptr > it.m_ptr; } + bool operator>(const reverse_iterator& it) const + { return m_ptr < it.m_ptr; } + bool operator<=(const reverse_iterator& it) const + { return m_ptr >= it.m_ptr; } + bool operator>=(const reverse_iterator& it) const + { return m_ptr <= it.m_ptr; } private: value_type *m_ptr; @@ -274,6 +282,14 @@ public: { return m_ptr == it.m_ptr; } bool operator !=(const const_reverse_iterator& it) const { return m_ptr != it.m_ptr; } + bool operator<(const const_reverse_iterator& it) const + { return m_ptr > it.m_ptr; } + bool operator>(const const_reverse_iterator& it) const + { return m_ptr < it.m_ptr; } + bool operator<=(const const_reverse_iterator& it) const + { return m_ptr >= it.m_ptr; } + bool operator>=(const const_reverse_iterator& it) const + { return m_ptr <= it.m_ptr; } protected: const value_type *m_ptr; diff --git a/tests/vectors/vectors.cpp b/tests/vectors/vectors.cpp index e3f6734c14..bf0fffa752 100644 --- a/tests/vectors/vectors.cpp +++ b/tests/vectors/vectors.cpp @@ -365,6 +365,13 @@ TEST_CASE("wxVector::reverse_iterator", "[vector][reverse_iterator]") CHECK( ri - rb == 2 ); CHECK( re - ri == 8 ); + CHECK( rb < ri ); + CHECK( rb <= ri ); + CHECK( ri <= ri ); + CHECK( ri >= ri ); + CHECK( ri < re ); + CHECK( ri <= re ); + #if wxUSE_STD_CONTAINERS_COMPATIBLY std::vector stdvec(rb, re); REQUIRE( stdvec.size() == 10 ); From 3e79f903b458fbe90ed6e099b53e2502a2f8f7b5 Mon Sep 17 00:00:00 2001 From: chris2oph Date: Thu, 6 Dec 2018 09:52:08 +0000 Subject: [PATCH 09/77] Make wxListBox::SetString() actually work in wxQt Do set the string on QListWidgetItem. Closes https://github.com/wxWidgets/wxWidgets/pull/1047 --- src/qt/listbox.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qt/listbox.cpp b/src/qt/listbox.cpp index 0a6382cca3..be40ae320f 100644 --- a/src/qt/listbox.cpp +++ b/src/qt/listbox.cpp @@ -160,7 +160,7 @@ wxString wxListBox::GetString(unsigned int n) const return wxQtConvertString( item->text() ); } -void wxListBox::SetString(unsigned int n, const wxString& WXUNUSED(s)) +void wxListBox::SetString(unsigned int n, const wxString& s) { QListWidgetItem* item = m_qtListWidget->item(n); wxCHECK_RET(item != NULL, wxT("wrong listbox index") ); @@ -169,6 +169,7 @@ void wxListBox::SetString(unsigned int n, const wxString& WXUNUSED(s)) item->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable); item->setCheckState(Qt::Unchecked); } + item->setText(wxQtConvertString(s)); } int wxListBox::GetSelection() const From 87bd82ab6f699bd6a3bea9986e06d0696940147f Mon Sep 17 00:00:00 2001 From: ashishmore Date: Fri, 19 Jan 2018 13:25:30 -0500 Subject: [PATCH 10/77] Fix wxMediaCtrl::SetPosition() in MSW WMP backend Step the control one frame forward to actually show the frame at the given position, otherwise the control only showed black screen. Closes https://github.com/wxWidgets/wxWidgets/pull/678 --- docs/changes.txt | 1 + src/msw/mediactrl_wmp10.cpp | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index 4d09c8f13b..70fc9f5c6d 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -173,6 +173,7 @@ wxMSW: - Send wxEVT_WEBVIEW_NAVIGATING when redirecting (Josue Andrade Gomes). - Fix build with MSVS 2005 broken in 3.1.1. - Add wxwidgets.props property sheet file for MSVS users. +- Fix jumping to the given position in wxMediaCtrl (ashishmore). wxOSX: diff --git a/src/msw/mediactrl_wmp10.cpp b/src/msw/mediactrl_wmp10.cpp index c220a5a6fb..c8d0d5e399 100644 --- a/src/msw/mediactrl_wmp10.cpp +++ b/src/msw/mediactrl_wmp10.cpp @@ -105,6 +105,7 @@ const IID IID_IWMPPlayer2 = {0x0E6B01D1,0xD407,0x4C85,{0xBF,0x5F,0x1C,0x01,0xF6, const IID IID_IWMPCore2 = {0xBC17E5B7,0x7561,0x4C18,{0xBB,0x90,0x17,0xD4,0x85,0x77,0x56,0x59}}; const IID IID_IWMPCore3 = {0x7587C667,0x628F,0x499F,{0x88,0xE7,0x6A,0x6F,0x4E,0x88,0x84,0x64}}; const IID IID_IWMPNetwork = {0xEC21B779,0xEDEF,0x462D,{0xBB,0xA4,0xAD,0x9D,0xDE,0x2B,0x29,0xA7}}; +const IID IID_IWMPControls2 = {0X6F030D25,0X0890,0X480F,{0X97, 0X75, 0X1F,0X7E,0X40,0XAB,0X5B,0X8E}}; enum WMPOpenState { @@ -265,6 +266,12 @@ public: }; +struct IWMPControls2 : public IWMPControls +{ +public: + virtual /* [helpstring][propget][id] */ HRESULT STDMETHODCALLTYPE step( + /* [in] */ long lStep ) = 0; +}; struct IWMPSettings : public IDispatch { @@ -665,6 +672,8 @@ public: IWMPPlayer* m_pWMPPlayer; // Main activex interface IWMPSettings* m_pWMPSettings; // Settings such as volume IWMPControls* m_pWMPControls; // Control interface (play etc.) + IWMPControls2* m_pWMPControls2; // Control interface (play etc.) + wxSize m_bestSize; // Actual movie size bool m_bWasStateChanged; // See the "introduction" @@ -717,7 +726,8 @@ wxWMP10MediaBackend::wxWMP10MediaBackend() #endif m_pWMPPlayer(NULL), m_pWMPSettings(NULL), - m_pWMPControls(NULL) + m_pWMPControls(NULL), + m_pWMPControls2(NULL) { m_evthandler = NULL; @@ -749,6 +759,8 @@ wxWMP10MediaBackend::~wxWMP10MediaBackend() m_pWMPSettings->Release(); if (m_pWMPControls) m_pWMPControls->Release(); + if (m_pWMPControls2) + m_pWMPControls->Release(); } } @@ -787,6 +799,8 @@ bool wxWMP10MediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent, wxLogSysError(wxT("Could not obtain controls from WMP10!")); return false; } + if (m_pWMPControls ) + m_pWMPControls->QueryInterface(IID_IWMPControls2, (void**)&m_pWMPControls2); } #endif @@ -1136,8 +1150,18 @@ bool wxWMP10MediaBackend::Stop() //--------------------------------------------------------------------------- bool wxWMP10MediaBackend::SetPosition(wxLongLong where) { + // The display does not update if only put_currentPosition is called. + // We have to find the time for the previous frame, set the control + // to that position and then tell it to step forward one frame. This + // forces the control to draw the frame to the screen, otherwise we get + // just a black screen. + + double timePerFrameInMSec = 0; + if (m_pWMPControls2) + timePerFrameInMSec = 1000 / GetPlaybackRate(); + HRESULT hr = m_pWMPControls->put_currentPosition( - ((LONGLONG)where.GetValue()) / 1000.0 + ((LONGLONG)where.GetValue() - timePerFrameInMSec) / 1000.0 ); if(FAILED(hr)) { @@ -1145,6 +1169,10 @@ bool wxWMP10MediaBackend::SetPosition(wxLongLong where) return false; } + if (m_pWMPControls2) + m_pWMPControls2->step(1); + + return true; } From 0e9d1908784ca350e6e211a0255eacedaeced28f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 7 Dec 2018 16:19:10 +0100 Subject: [PATCH 11/77] Fix wrong Release() call in the previous commit The last commit had a bad bug as it called Release() on a wrong pointer. Also use "0x" prefix for hexadecimal numbers and not "0X". See https://github.com/wxWidgets/wxWidgets/pull/678 --- src/msw/mediactrl_wmp10.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/msw/mediactrl_wmp10.cpp b/src/msw/mediactrl_wmp10.cpp index c8d0d5e399..06ab5d889d 100644 --- a/src/msw/mediactrl_wmp10.cpp +++ b/src/msw/mediactrl_wmp10.cpp @@ -105,7 +105,7 @@ const IID IID_IWMPPlayer2 = {0x0E6B01D1,0xD407,0x4C85,{0xBF,0x5F,0x1C,0x01,0xF6, const IID IID_IWMPCore2 = {0xBC17E5B7,0x7561,0x4C18,{0xBB,0x90,0x17,0xD4,0x85,0x77,0x56,0x59}}; const IID IID_IWMPCore3 = {0x7587C667,0x628F,0x499F,{0x88,0xE7,0x6A,0x6F,0x4E,0x88,0x84,0x64}}; const IID IID_IWMPNetwork = {0xEC21B779,0xEDEF,0x462D,{0xBB,0xA4,0xAD,0x9D,0xDE,0x2B,0x29,0xA7}}; -const IID IID_IWMPControls2 = {0X6F030D25,0X0890,0X480F,{0X97, 0X75, 0X1F,0X7E,0X40,0XAB,0X5B,0X8E}}; +const IID IID_IWMPControls2 = {0x6F030D25,0x0890,0x480F,{0x97, 0x75, 0x1F,0x7E,0x40,0xAB,0x5B,0x8E}}; enum WMPOpenState { @@ -760,7 +760,7 @@ wxWMP10MediaBackend::~wxWMP10MediaBackend() if (m_pWMPControls) m_pWMPControls->Release(); if (m_pWMPControls2) - m_pWMPControls->Release(); + m_pWMPControls2->Release(); } } From b5944a07309199afb1c5374a1031f536e357221b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 8 Dec 2018 00:47:03 +0100 Subject: [PATCH 12/77] Fix wxAUI build with wxUSE_MDI==0 Include wx/frame.h explicitly as it's not included by wx/aui/tabmdi.h in this case. Closes #18291. --- src/aui/auibook.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp index 9bfe2a7589..12afa3a9b6 100644 --- a/src/aui/auibook.cpp +++ b/src/aui/auibook.cpp @@ -26,6 +26,7 @@ #include "wx/settings.h" #include "wx/dcclient.h" #include "wx/dcmemory.h" + #include "wx/frame.h" #endif #include "wx/aui/tabmdi.h" From 84f788ff8975941dcbc47a6592862c1c4dca009b Mon Sep 17 00:00:00 2001 From: Graham Dawes Date: Fri, 7 Dec 2018 15:47:03 +0000 Subject: [PATCH 13/77] Implement missing wxTopLevel methods for wxQt This allows the unit test wxPersistTLW to pass. Closes https://github.com/wxWidgets/wxWidgets/pull/1055 --- src/qt/toplevel.cpp | 46 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 7 deletions(-) diff --git a/src/qt/toplevel.cpp b/src/qt/toplevel.cpp index e4a6fa54d8..4ab7344dbb 100644 --- a/src/qt/toplevel.cpp +++ b/src/qt/toplevel.cpp @@ -62,37 +62,69 @@ bool wxTopLevelWindowQt::Create( wxWindow *parent, wxWindowID winId, return true; } -void wxTopLevelWindowQt::Maximize(bool WXUNUSED(maximize)) +void wxTopLevelWindowQt::Maximize(bool maximize) { + QWidget *widget = GetHandle(); + + if ( maximize ) + { + widget->showMaximized(); + } + else + { + widget->showNormal(); + } } void wxTopLevelWindowQt::Restore() { + GetHandle()->showNormal(); } -void wxTopLevelWindowQt::Iconize(bool WXUNUSED(iconize) ) +void wxTopLevelWindowQt::Iconize(bool iconize ) { + QWidget *widget = GetHandle(); + + if ( iconize ) + { + widget->showMinimized(); + } + else + { + widget->showNormal(); + } } bool wxTopLevelWindowQt::IsMaximized() const { - return false; + return GetHandle()->isMaximized(); } bool wxTopLevelWindowQt::IsIconized() const { - return false; + return GetHandle()->isMinimized(); } -bool wxTopLevelWindowQt::ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style)) +bool wxTopLevelWindowQt::ShowFullScreen(bool show, long WXUNUSED(style)) { - return false; + QWidget *widget = GetHandle(); + + if ( show ) + { + widget->showFullScreen(); + } + else + { + widget->showNormal(); + } + + return true; } bool wxTopLevelWindowQt::IsFullScreen() const { - return false; + return GetHandle()->isFullScreen(); } void wxTopLevelWindowQt::SetTitle(const wxString& title) From 36aa63f2fd5ca1b311fe62d0b1af7e118dde2b1f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 8 Dec 2018 18:26:21 +0100 Subject: [PATCH 14/77] Slightly improve README wording Also add direct links to the installation instructions. --- README.md | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3ec9d03626..b3c9bcb231 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Platforms [![AppVeyor](https://img.shields.io/appveyor/ci/wxWidgets/wxWidgets/master.svg?label=Windows)](https://ci.appveyor.com/project/wxWidgets/wxwidgets) [![Travis](https://img.shields.io/travis/wxWidgets/wxWidgets/master.svg?label=Linux)](https://travis-ci.org/wxWidgets/wxWidgets) -wxWidgets currently supports the following primary platforms: +This version of wxWidgets supports the following primary platforms: - Windows XP, Vista, 7, 8 and 10 (32/64 bits). - Most Unix variants using the GTK+ toolkit (version 2.6 or newer or 3.x). @@ -49,25 +49,32 @@ Building -------- For building the library, please see platform-specific documentation under -`docs/` directory. +`docs/` directory, e.g. here are the instructions for +[wxGTK](docs/gtk/install.md), [wxMSW](docs/msw/install.md) and +[wxOSX](docs/osx/install.md). If you're building the sources checked out from Git, and not from a released -versions, please see these additional [Git-specific notes](README-GIT.md). +version, please see these additional [Git-specific notes](README-GIT.md). Further information ------------------- -If you are looking for support, you can get it from +If you are looking for community support, you can get it from - [Mailing Lists](https://www.wxwidgets.org/support/mailing-lists/) - [Discussion Forums](https://forums.wxwidgets.org/) - [#wxwidgets IRC channel](https://www.wxwidgets.org/support/irc/) - [Stack Overflow](https://stackoverflow.com/questions/tagged/wxwidgets) (tag your questions with `wxwidgets`) -- Please report bugs at https://trac.wxwidgets.org/newticket +- And you can report bugs at https://trac.wxwidgets.org/newticket -We would also gladly welcome [your contributions](.github/CONTRIBUTING.md). +[Commercial support](https://www.wxwidgets.org/support/commercial/) is also +available. + +Finally, keep in mind that wxWidgets is an open source project collaboratively +developed by its users and your contributions to it are always welcome. Please +check [our guidelines](.github/CONTRIBUTING.md) if you'd like to do it. Have fun! From facb06a1b8788a08617b41f44f637e8c942239e5 Mon Sep 17 00:00:00 2001 From: Pavel Kalugin Date: Sat, 8 Dec 2018 20:41:00 +0300 Subject: [PATCH 15/77] Fix wxSize member names in the documentation wxSize members x and y were incorrectly mentioned as width and height in the docs. Closes https://github.com/vadz/wxWidgets/pull/6 --- interface/wx/gdicmn.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/wx/gdicmn.h b/interface/wx/gdicmn.h index 0e8ffd53c8..a31a702ffe 100644 --- a/interface/wx/gdicmn.h +++ b/interface/wx/gdicmn.h @@ -902,7 +902,7 @@ wxColourDatabase* wxTheColourDatabase; @class wxSize A wxSize is a useful data structure for graphics operations. - It simply contains integer @e width and @e height members. + It simply contains integer @e x and @e y members. Note that the width and height stored inside a wxSize object may be negative and that wxSize functions do not perform any check against negative values From 2e007cb3ec18c54c9436c989bac5c2b3a9315619 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 8 Dec 2018 18:57:36 +0100 Subject: [PATCH 16/77] Update the list of changes before 3.1.2 release Update both the (more detailed) README and the (shorter) announcement message. Also update the statistics and the cumulated changes since 3.0. --- docs/publicity/announce.txt | 37 ++++++++++-------- docs/readme.txt | 75 ++++++++++++++++++++----------------- 2 files changed, 61 insertions(+), 51 deletions(-) diff --git a/docs/publicity/announce.txt b/docs/publicity/announce.txt index 5434c56687..bfa2e20ab1 100644 --- a/docs/publicity/announce.txt +++ b/docs/publicity/announce.txt @@ -1,39 +1,44 @@ -February 19, 2018 -- The wxWidgets team is pleased to announce a new +December 10, 2018 -- The wxWidgets team is pleased to announce a new release of our open source framework for the development of native cross-platform applications in C++. -wxWidgets 3.1.1 is the second release in the 3.1 development +wxWidgets 3.1.2 is the latest release in the 3.1 development branch and is now available at - https://github.com/wxWidgets/wxWidgets/releases/tag/v3.1.1 + https://github.com/wxWidgets/wxWidgets/releases/tag/v3.1.2 Compared to the stable 3.0.x series, this version brings many improvements and even more bug fixes, please see the change log -https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.1/docs/changes.txt +https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.2/docs/changes.txt for the incomplete list of the most important ones. Here is the maximally condensed summary of the changes compared to 3.0: +- Build system improvements: support for new compilers (MSVS 2017, g++ 8) and + OS versions (macOS 10.14 and its dark mode) as well as an entirely new new + CMake build system. - New features: support for mouse gesture events (GSoC 2017 project); - fractional pen widths in wxGraphicsContext; arbitrary label windows in - wxStaticBox; markup in wxDataViewCtrl items text; better support for high DPI - monitors; support for ZIP 64 files; much improved accessibility support under + non-integer font sizes and arbitrary font weights in wxFont; fractional pen + widths in wxGraphicsContext; arbitrary label windows in wxStaticBox; markup + in wxDataViewCtrl items text; better support for high DPI monitors; support + for ZIP 64 files; LZMA compression; much improved accessibility support under MSW. - New classes: wxActivityIndicator, wxAddRemoveCtrl, wxAppProgressIndicator, wxNativeWindow, wxPowerResourceBlocker, wxSecretStore. -- And methods: wxDateTime::GetWeekBasedYear(), wxListBox::GetTopItem(), - wxProcess::Activate(), wxTextEntry::ForceUpper(), several ones in - wxRendererNative, wxStandardPaths::GetUserDir(), wxUIActionSimulator - ::Select() and many others. -- Significant improvements to: wxBusyInfo, wxNotificationMessage. +- And methods: wxDataViewToggleRenderer::ShowAsRadio(), wxDateTime:: + GetWeekBasedYear(), wxDisplay::GetPPI(), wxGrid::SetCornerLabelValue(), + wxHtmlEasyPrinting::SetPromptMode(), wxJoystickEvent::GetButtonOrdinal(), + wxListBox::GetTopItem(), wxProcess::Activate(), wxTextEntry::ForceUpper(), + several ones in wxRendererNative, wxStandardPaths::GetUserDir(), + wxToolbook::EnablePage(), wxUIActionSimulator::Select() and many others. +- Significant improvements to: wxBusyInfo, wxDataViewCtrl, + wxNotificationMessage, wxStaticBox, wxStyledTextCtrl. - Latest versions of all bundled 3rd party libraries, including all the security fixed and support for WebKit 2 and GStreamer 1.7 under Unix. - Revamped OpenGL support better suited to modern OpenGL (3.2+). - Further C++11 support improvements. -- New CMake-based alternative build system. -- Support for latest compilers: MSVS 2017, g++ 7, clang 6. - A lot of bug fixes, especially in wxGTK3 and wxOSX/Cocoa ports. - New experimental wxQt port. @@ -42,8 +47,8 @@ This release is a "development" one as it makes (very few) incompatible API changes compared to 3.0 and does not guarantee the ABI stability, unlike the 3.0.x series. It is not inherently more buggy or less stable than the "stable" releases and you're encouraged -to use it. If you're already using 3.0, upgrading shouldn't require -any special effort, so please try it out. +to use it, including in production. If you're already using 3.0, upgrading +shouldn't require any special effort, so please try it out. We hope that you will enjoy using the new release! diff --git a/docs/readme.txt b/docs/readme.txt index 6caebb7e9a..8a5d0c649f 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -24,53 +24,52 @@ download from: * https://github.com/wxWidgets/wxWidgets/releases/tag/v3.1.2/ -Changes since 3.1.0 +Changes since 3.1.1 ------------------- -There have been more than 2800 commits from more than 160 contributors (79 with -multiple contributions) since 3.1.0 release. New features added since then -include: +There have been more than 1200 commits from 75 contributors (41 with multiple +contributions) since 3.1.1 release. This release primarily contains bug fixes +(closing more than 100 bugs from wxTrac) and incremental improvements in +preparation for the next stable 3.2.0 release, however there is a usual lot of +new features as well, including: -- Support for gesture events has been added (GSoC 2017 project). -- wxWebView can now return JavaScript results to the C++ code (GSoC 2017). -- New wxSecretStore class for securely storing user passwords. +- Initial support for macOS 10.14 and its dark mode. +- Support for non-integer font sizes and arbitrary font weights. +- New wxLZMA{Input,Output}Stream classes. +- Add wxDataViewToggleRenderer::ShowAsRadio(), wxDisplay::GetPPI(), + wxGrid::SetCornerLabelValue(), wxHtmlEasyPrinting::SetPromptMode(), + wxJoystickEvent::GetButtonOrdinal(), wxToolbook::EnablePage(). Some of the other improvements: -- wxWidgets can now be built with CMake too. -- Strings can now be translated differently depending on their context. -- Converting between wxString and UTF-8 encoded std::string is now - simpler and unsafe wxString can now be disabled on the opt-in basis - (see http://wxwidgets.blogspot.com/2017/02/safer-s.html) -- It is possible to use any window (e.g. wxCheckBox) as wxStaticBox label now. -- Many improvements to accessibility support under MSW. -- wxGraphicsContext now supports pens with fractional widths. -- Support for XDG file layout under Unix. -- Many bug fixes to the behaviour (including TAB navigation) and appearances, - especially in wxGTK3 and wxOSX ports. -- wxDataViewCtrl items and headers can be formatted using simple markup - and it is simpler to combine to put items with checkboxes into it. Many bugs - and inconsistencies between platforms in this control have been fixed too. -- Several enhancements to wxStyledTextCtrl including better support for - custom lexers and auto-completion. -- Many improvements to the (still experimental) wxQt port. - -Additionally, the latest versions of compilers (e.g. MSVS 2017) and -operating systems (macOS 10.12) are now supported and all the third -party libraries have been updated to their latest versions. +- There were again many improvements to the (still experimental) wxQt port. +- Fix several bugs related to focus handling and TAB navigation in wxGTK. +- Make it possible to control pagination in wxHTML more precisely. +- Fix several problems with high-DPI displays. +- wxOSX now uses native NSImage/UIImage representation for wxBitmap. +- Support strike-through font attribute in XRC and wxDataViewCtrl markup too. +- Support more than 4 buttons in wxJoystick. +- Add wxwidgets.props property sheet file for MSVS users. Please refer to the detailed change log for the full list of changes: https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.2/docs/changes.txt +Notice that this release is almost completely compatible with 3.1.1 at the API +level, so upgrading to it if you're already using wxWidgets 3 should be +straightforward. + + Changes since 3.0 ----------------- Compared to the stable 3.0.x series, this version brings too many -improvements and even more bug fixes to list them them all. Here is the +improvements and even more bug fixes to list them all, but here is the maximally condensed summary: +- Build system improvements: support for new compilers (MSVS 2017, g++ 8) and + OS versions as well as an entirely new new CMake build system. - New features: support for mouse gesture events (GSoC 2017 project); fractional pen widths in wxGraphicsContext; arbitrary label windows in wxStaticBox; markup in wxDataViewCtrl items text; better support for high DPI @@ -83,13 +82,12 @@ maximally condensed summary: wxProcess::Activate(), wxTextEntry::ForceUpper(), several ones in wxRendererNative, wxStandardPaths::GetUserDir(), wxUIActionSimulator ::Select() and many others. -- Significant improvements to: wxBusyInfo, wxNotificationMessage. +- Significant improvements to: wxBusyInfo, wxDataViewCtrl, + wxNotificationMessage, wxStaticBox, wxStyledTextCtrl. - Latest versions of all bundled 3rd party libraries, including all the security fixed and support for WebKit 2 and GStreamer 1.7 under Unix. - Revamped OpenGL support better suited to modern OpenGL (3.2+). - Further C++11 support improvements. -- New CMake-based alternative build system. -- Support for latest compilers: MSVS 2017, g++ 7, clang 6. - A lot of bug fixes, especially in wxGTK3 and wxOSX/Cocoa ports. - New experimental wxQt port. @@ -98,7 +96,7 @@ maximally condensed summary: Platforms Supported ------------------- -wxWidgets currently supports the following primary platforms: +This version of wxWidgets supports the following primary platforms: * Windows XP, Vista, 7, 8 and 10 (32/64 bits). * Most Unix variants using the GTK+ toolkit (version 2.6 or newer) @@ -200,7 +198,7 @@ problems so this ensures that your report will be addressed sooner. Further Information ------------------- -If you are looking for support, you can get it from +If you are looking for community support, you can get it from * Mailing Lists: https://www.wxwidgets.org/support/mailing-lists/ * Discussion Forums: https://forums.wxwidgets.org/ @@ -208,6 +206,13 @@ If you are looking for support, you can get it from * Stack Overflow (tag your questions with "wxwidgets"): https://stackoverflow.com/questions/tagged/wxwidgets +Commercial support is also available, please see +https://www.wxwidgets.org/support/commercial/ + +Finally, keep in mind that wxWidgets is an open source project collaboratively +developed by its users and your contributions to it are always welcome! + + Have fun! -The wxWidgets Team, February 2018 +The wxWidgets Team, December 2018 From aef36f912ae8df813397d71526b3ecc0cf46071c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 8 Dec 2018 19:09:17 +0100 Subject: [PATCH 17/77] Fix 3.1.2 release date in the change log and the manual --- docs/changes.txt | 2 +- docs/doxygen/mainpages/manual.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index 70fc9f5c6d..e12299d2ad 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -102,7 +102,7 @@ Changes in behaviour which may result in build errors removing its name. -3.1.2: (released 2018-??-??) +3.1.2: (released 2018-12-10) ---------------------------- All: diff --git a/docs/doxygen/mainpages/manual.h b/docs/doxygen/mainpages/manual.h index aa180ff0df..5251aebe80 100644 --- a/docs/doxygen/mainpages/manual.h +++ b/docs/doxygen/mainpages/manual.h @@ -14,7 +14,7 @@ @author Julian Smart, Vadim Zeitlin, Robin Dunn, Stefan Csomor, Bryan Petty, Francesco Montorsi, Robert Roebling et al -@date February 19, 2018 +@date December 10, 2018 @n From b408e4c630635f48f37bd14be7dd123f046093b0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 8 Dec 2018 19:09:43 +0100 Subject: [PATCH 18/77] Update the release notes for 3.1.2 Change the version and update the list of MinGW compilers for which the binaries are provided in this release. --- docs/release.md | 129 +++++++++++++++++++++++++----------------------- 1 file changed, 66 insertions(+), 63 deletions(-) diff --git a/docs/release.md b/docs/release.md index 4856571a66..7ce86bec92 100644 --- a/docs/release.md +++ b/docs/release.md @@ -1,102 +1,105 @@ Welcome to wxWidgets, a free and open source cross-platform C++ framework for writing advanced GUI applications using native controls. -wxWidgets 3.1.1 is the second release in the 3.1 development branch. This release is a "development" one as it makes (very few) incompatible API changes compared to 3.0 and does not guarantee the ABI stability, unlike the 3.0.x series. It is not inherently more buggy or less stable than the "stable" releases and you're encouraged to use it. If you're already using 3.0, upgrading shouldn't require any special effort, so please try it out. +wxWidgets 3.1.2 is the latest release in the 3.1 development branch. This release is a "development" one as it makes (very few) incompatible API changes compared to 3.0 and does not guarantee the ABI stability, unlike the 3.0.x series. It is not inherently more buggy or less stable than the "stable" releases and you're encouraged to use it, including in production. If you're already using 3.0, upgrading shouldn't require any special effort, so please try it out. -Please see [**README**](https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.1/docs/readme.txt) for more information about this release and the [change log](https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.1/docs/changes.txt) for details of the changes in it. +Please see [**README**](https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.2/docs/readme.txt) for more information about this release and the [change log](https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.2/docs/changes.txt) for the details of the changes in it. ## Source Files and Documentation If you intend to build wxWidgets from sources (which is recommended), please do **NOT** download the files using the "Source code" links just above, which are automatically generated by GitHub and don't contain the submodules sources which are necessary for building wxWidgets. -Instead, download one of [wxWidgets-3.1.1.zip](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1/wxWidgets-3.1.1.zip) or [wxWidgets-3.1.1.7z](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1/wxWidgets-3.1.1.7z), for much smaller size, for Microsoft Windows systems or [wxWidgets-3.1.1.tar.bz2](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1/wxWidgets-3.1.1.tar.bz2) for Unix ones, including macOS. These archives have exactly the same contents, but use the line endings appropriate for the corresponding platform. +Instead, download one of [wxWidgets-3.1.2.zip](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.2/wxWidgets-3.1.2.zip) or [wxWidgets-3.1.2.7z](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.2/wxWidgets-3.1.2.7z), for much smaller size, for Microsoft Windows systems or [wxWidgets-3.1.2.tar.bz2](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.2/wxWidgets-3.1.2.tar.bz2) for Unix ones, including macOS. These archives have exactly the same contents, but use the line endings appropriate for the corresponding platform. -In addition, we provide archives containing the documentation in either HTML or Microsoft CHM formats. Notice that the documentation is also [available online](https://docs.wxwidgets.org/3.1). +In addition, we provide archives containing the documentation in either HTML or Microsoft CHM formats. Notice that the documentation is also [available online](https://docs.wxwidgets.org/3.1.2). -Finally, Microsoft Windows users may download [Setup.exe file](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.1/wxMSW-3.1.1-Setup.exe) containing both sources and documentation, however please note that this file does _not_ contain any binaries, please see below for those. +Finally, Microsoft Windows users may download [Setup.exe file](https://github.com/wxWidgets/wxWidgets/releases/download/v3.1.2/wxMSW-3.1.2-Setup.exe) containing both sources and documentation, however please note that this file does _not_ contain any binaries, please see below for those. To verify your download please use the following SHA-1 checksums: - 0000000000000000000000000000000000000000 wxMSW-3.1.1-Setup.exe - 0000000000000000000000000000000000000000 wxWidgets-3.1.1-docs-chm.zip - 0000000000000000000000000000000000000000 wxWidgets-3.1.1-docs-html.tar.bz2 - 0000000000000000000000000000000000000000 wxWidgets-3.1.1-docs-html.zip - 0000000000000000000000000000000000000000 wxWidgets-3.1.1-headers.7z - 0000000000000000000000000000000000000000 wxWidgets-3.1.1.7z - 0000000000000000000000000000000000000000 wxWidgets-3.1.1.tar.bz2 - 0000000000000000000000000000000000000000 wxWidgets-3.1.1.zip + 0000000000000000000000000000000000000000 wxMSW-3.1.2-Setup.exe + 0000000000000000000000000000000000000000 wxWidgets-3.1.2-docs-chm.zip + 0000000000000000000000000000000000000000 wxWidgets-3.1.2-docs-html.tar.bz2 + 0000000000000000000000000000000000000000 wxWidgets-3.1.2-docs-html.zip + 0000000000000000000000000000000000000000 wxWidgets-3.1.2-headers.7z + 0000000000000000000000000000000000000000 wxWidgets-3.1.2.7z + 0000000000000000000000000000000000000000 wxWidgets-3.1.2.tar.bz2 + 0000000000000000000000000000000000000000 wxWidgets-3.1.2.zip ## Binaries We provide pre-built binary files for the following compilers: * Microsoft Visual C++ compiler versions 9.0, 10.0, 11.0, 12.0, 14.0 and 14.1 (corresponding to marketing product names of Microsoft Visual Studio 2008, 2010, 2012, 2013, 2015 and 2017 respectively). -* TDM-GCC version 5.1 and MinGW-w64 version 7.2 (with the default SJLJ exceptions propagation method, using C++11). Please note that you need to use the very latest MinGW-w64 7.2 compiler release with this version of the compiler which can be downloaded from [here for 32 bits](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/7.2.0/threads-win32/sjlj/i686-7.2.0-release-win32-sjlj-rt_v5-rev1.7z/download) and [here for 64 bits](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/7.2.0/threads-win32/seh/x86_64-7.2.0-release-win32-seh-rt_v5-rev1.7z/download), the older "rev0" release has a known bug affecting building wxWidgets in some scenarios. +* TDM-GCC version 5.1 and MinGW-w64 versions 7.3 and 8.1 (with the default SJLJ exceptions propagation method, using C++11). ### For Developers -For developing applications with wxWidgets you need to download the compiler-independent `wxWidgets-3.1.1_Headers.7z` file and one of `wxMSW-3.1.1-vcXXX_Dev.7z` or `wxMSW-3.1.1_gccXXX_Dev.7z` files depending on your compiler, its version and the target architecture (x86 if not specified or x64). +For developing applications with wxWidgets you need to download the compiler-independent `wxWidgets-3.1.2_Headers.7z` file and one of `wxMSW-3.1.2-vcXXX_Dev.7z` or `wxMSW-3.1.2_gccXXX_Dev.7z` files depending on your compiler, its version and the target architecture (x86 if not specified or x64). Unpack both files into the same directory so that `include` and `lib` directories are at the same level after unpacking. You should be able to compile and link applications using wxWidgets in both debug and release modes but the debug symbols are provided only for debug libraries in this archive, see below for the release build debug symbols. ### For End Users -End users may download one of `wxMSW-3.1.1_vcXXX_ReleaseDLL.7z` or `wxMSW-3.1.1_gccXXX_ReleaseDLL.7z` files to get just the DLLs required for running the applications using wxWidgets. +End users may download one of `wxMSW-3.1.2_vcXXX_ReleaseDLL.7z` or `wxMSW-3.1.2_gccXXX_ReleaseDLL.7z` files to get just the DLLs required for running the applications using wxWidgets. ### For Debugging -* Microsoft Visual C++ users: Files `wxMSW-3.1.1_vcXXX_ReleasePDB.7z` contain the debug symbols for the release build of the DLLs. Download them if you want to debug your own applications in release build or if you want to get meaningful information from mini-dumps retrieved from your users machines. -* MinGW-TDM users: Currently the debug symbols are not available for the release build of the DLLs (only the debug versions of the DLLs contains the debug - symbols). +* Microsoft Visual C++ users: Files `wxMSW-3.1.2_vcXXX_ReleasePDB.7z` contain the debug symbols for the release build of the DLLs. Download them if you want to debug your own applications in release build or if you want to get meaningful information from mini-dumps retrieved from your users machines. +* MinGW-TDM users: Currently the debug symbols are not available for the release build of the DLLs (only the debug versions of the DLLs contains the debug symbols). ### Binary File Download Verification To verify your download please use the following SHA-1 checksums: - 0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc510TDM_Dev.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc510TDM_ReleaseDLL.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc510TDM_x64_Dev.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc510TDM_x64_ReleaseDLL.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc720_Dev.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc720_ReleaseDLL.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc720_x64_Dev.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_gcc720_x64_ReleaseDLL.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc90_Dev.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc90_ReleaseDLL.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc90_ReleasePDB.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc90_x64_Dev.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc90_x64_ReleaseDLL.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc90_x64_ReleasePDB.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc100_Dev.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc100_ReleaseDLL.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc100_ReleasePDB.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc100_x64_Dev.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc100_x64_ReleaseDLL.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc100_x64_ReleasePDB.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc110_Dev.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc110_ReleaseDLL.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc110_ReleasePDB.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc110_x64_Dev.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc110_x64_ReleaseDLL.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc110_x64_ReleasePDB.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc120_Dev.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc120_ReleaseDLL.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc120_ReleasePDB.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc120_x64_Dev.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc120_x64_ReleaseDLL.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc120_x64_ReleasePDB.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc140_Dev.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc140_ReleaseDLL.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc140_ReleasePDB.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc140_x64_Dev.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc140_x64_ReleaseDLL.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc140_x64_ReleasePDB.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc141_Dev.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc141_ReleaseDLL.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc141_ReleasePDB.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc141_x64_Dev.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc141_x64_ReleaseDLL.7z - 0000000000000000000000000000000000000000 wxMSW-3.1.1_vc141_x64_ReleasePDB.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_gcc510TDM_Dev.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_gcc510TDM_ReleaseDLL.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_gcc510TDM_x64_Dev.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_gcc510TDM_x64_ReleaseDLL.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_gcc730_Dev.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_gcc730_ReleaseDLL.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_gcc730_x64_Dev.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_gcc730_x64_ReleaseDLL.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_gcc810_Dev.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_gcc810_ReleaseDLL.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_gcc810_x64_Dev.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_gcc810_x64_ReleaseDLL.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc90_Dev.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc90_ReleaseDLL.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc90_ReleasePDB.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc90_x64_Dev.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc90_x64_ReleaseDLL.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc90_x64_ReleasePDB.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc100_Dev.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc100_ReleaseDLL.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc100_ReleasePDB.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc100_x64_Dev.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc100_x64_ReleaseDLL.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc100_x64_ReleasePDB.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc110_Dev.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc110_ReleaseDLL.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc110_ReleasePDB.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc110_x64_Dev.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc110_x64_ReleaseDLL.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc110_x64_ReleasePDB.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc120_Dev.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc120_ReleaseDLL.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc120_ReleasePDB.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc120_x64_Dev.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc120_x64_ReleaseDLL.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc120_x64_ReleasePDB.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc140_Dev.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc140_ReleaseDLL.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc140_ReleasePDB.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc140_x64_Dev.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc140_x64_ReleaseDLL.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc140_x64_ReleasePDB.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc141_Dev.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc141_ReleaseDLL.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc141_ReleasePDB.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc141_x64_Dev.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc141_x64_ReleaseDLL.7z + 0000000000000000000000000000000000000000 wxMSW-3.1.2_vc141_x64_ReleasePDB.7z ## Reporting Problems From fd5c62bc41d7cb82848a06759e09a1e5df497cd8 Mon Sep 17 00:00:00 2001 From: "oleksii.vorobiov" Date: Mon, 19 Nov 2018 13:17:32 +0200 Subject: [PATCH 19/77] Make updating the value in wxEVT_SPINCTRL work in wxMSW In wxMSW, the value of the control was modified after executing the user-defined wxEVT_SPINCTRL handler which meant that any calls to SetValue() there were effectively ignored. Fix this and add a unit test checking for the described scenario. Closes https://github.com/wxWidgets/wxWidgets/pull/1027 Closes #18187. --- src/msw/spinctrl.cpp | 9 +++---- tests/controls/spinctrltest.cpp | 42 +++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp index fbb9e2b387..058e08ed3d 100644 --- a/src/msw/spinctrl.cpp +++ b/src/msw/spinctrl.cpp @@ -244,6 +244,7 @@ void wxSpinCtrl::NormalizeValue() if ( changed ) { + m_oldValue = value; SendSpinUpdate(value); } } @@ -666,10 +667,7 @@ void wxSpinCtrl::SendSpinUpdate(int value) wxSpinEvent event(wxEVT_SPINCTRL, GetId()); event.SetEventObject(this); event.SetInt(value); - (void)HandleWindowEvent(event); - - m_oldValue = value; } bool wxSpinCtrl::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, @@ -687,7 +685,10 @@ bool wxSpinCtrl::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, // might be using 32 bit range. int new_value = GetValue(); if (m_oldValue != new_value) - SendSpinUpdate( new_value ); + { + m_oldValue = new_value; + SendSpinUpdate(new_value); + } return true; } diff --git a/tests/controls/spinctrltest.cpp b/tests/controls/spinctrltest.cpp index da4df9363f..e91079de3c 100644 --- a/tests/controls/spinctrltest.cpp +++ b/tests/controls/spinctrltest.cpp @@ -38,6 +38,7 @@ private: WXUISIM_TEST( Wrap ); CPPUNIT_TEST( Range ); CPPUNIT_TEST( Value ); + WXUISIM_TEST( SetValueInsideEventHandler ); CPPUNIT_TEST_SUITE_END(); void Initial(); @@ -46,6 +47,10 @@ private: void Wrap(); void Range(); void Value(); + void SetValueInsideEventHandler(); + + // Helper event handler for SetValueInsideEventHandler() test. + void OnSpinSetValue(wxSpinEvent &e); wxSpinCtrl* m_spin; @@ -224,4 +229,41 @@ void SpinCtrlTestCase::Value() CPPUNIT_ASSERT_EQUAL(0, updatedText.GetCount()); } +void SpinCtrlTestCase::OnSpinSetValue(wxSpinEvent &e) +{ + // Constrain the value to be in the 1..16 range or 32. + int newVal = e.GetValue(); + + if ( newVal == 31 ) + m_spin->SetValue(16); + else if ( newVal > 16 ) + m_spin->SetValue(32); +} + +void SpinCtrlTestCase::SetValueInsideEventHandler() +{ +#if wxUSE_UIACTIONSIMULATOR + m_spin->Bind(wxEVT_SPINCTRL, &SpinCtrlTestCase::OnSpinSetValue, this); + + wxUIActionSimulator sim; + + // run multiple times to make sure there are no issues with keeping old value + for ( size_t i = 0; i < 2; i++ ) + { + m_spin->SetFocus(); + wxYield(); + + sim.Char(WXK_DELETE); + sim.Char(WXK_DELETE); + sim.Text("20"); + wxYield(); + + wxTheApp->GetTopWindow()->SetFocus(); + wxYield(); + + CPPUNIT_ASSERT_EQUAL(32, m_spin->GetValue()); + } +#endif // wxUSE_UIACTIONSIMULATOR +} + #endif From 089eeea3ef80e51c71d2487b484ad56c11f4eafd Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 8 Dec 2018 20:17:57 +0100 Subject: [PATCH 20/77] Fix wxMSW build with wxUSE_UXTHEME==0 Make wxUxThemeIsActive() available even in this case to fix compilation in some places and add the unavoidable preprocessor checks in other ones. Closes #18207. --- include/wx/aui/auibar.h | 2 +- include/wx/aui/tabart.h | 2 +- include/wx/msw/uxtheme.h | 8 ++++++++ include/wx/systhemectrl.h | 2 +- src/aui/barartmsw.cpp | 6 +++--- src/aui/tabartmsw.cpp | 6 +++--- src/generic/richtooltipg.cpp | 29 ++++++++++++++++------------- src/msw/combo.cpp | 6 ------ src/msw/menuitem.cpp | 11 ++++++++++- 9 files changed, 43 insertions(+), 29 deletions(-) diff --git a/include/wx/aui/auibar.h b/include/wx/aui/auibar.h index 274757d88e..ac5131f274 100644 --- a/include/wx/aui/auibar.h +++ b/include/wx/aui/auibar.h @@ -759,7 +759,7 @@ typedef void (wxEvtHandler::*wxAuiToolBarEventFunction)(wxAuiToolBarEvent&); #define wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK wxEVT_AUITOOLBAR_MIDDLE_CLICK #define wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG wxEVT_AUITOOLBAR_BEGIN_DRAG -#ifdef __WXMSW__ +#if defined(__WXMSW__) && wxUSE_UXTHEME #define wxHAS_NATIVE_TOOLBAR_ART #include "wx/aui/barartmsw.h" #define wxAuiDefaultToolBarArt wxAuiMSWToolBarArt diff --git a/include/wx/aui/tabart.h b/include/wx/aui/tabart.h index f11e75b4ba..565ac1067a 100644 --- a/include/wx/aui/tabart.h +++ b/include/wx/aui/tabart.h @@ -318,7 +318,7 @@ protected: #define wxHAS_NATIVE_TABART #include "wx/aui/tabartgtk.h" #define wxAuiDefaultTabArt wxAuiGtkTabArt - #elif defined(__WXMSW__) + #elif defined(__WXMSW__) && wxUSE_UXTHEME #define wxHAS_NATIVE_TABART #include "wx/aui/tabartmsw.h" #define wxAuiDefaultTabArt wxAuiMSWTabArt diff --git a/include/wx/msw/uxtheme.h b/include/wx/msw/uxtheme.h index 3207521c0a..9d7000cd3b 100644 --- a/include/wx/msw/uxtheme.h +++ b/include/wx/msw/uxtheme.h @@ -13,6 +13,8 @@ #include "wx/defs.h" +#if wxUSE_UXTHEME + #include "wx/msw/private.h" // we use GetHwndOf() #include @@ -253,5 +255,11 @@ private: wxDECLARE_NO_COPY_CLASS(wxUxThemeHandle); }; +#else // !wxUSE_UXTHEME + +inline bool wxUxThemeIsActive() { return false; } + +#endif // wxUSE_UXTHEME/!wxUSE_UXTHEME + #endif // _WX_UXTHEME_H_ diff --git a/include/wx/systhemectrl.h b/include/wx/systhemectrl.h index 8af2d5d9c1..269c361855 100644 --- a/include/wx/systhemectrl.h +++ b/include/wx/systhemectrl.h @@ -12,7 +12,7 @@ #include "wx/defs.h" -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) +#if defined(__WXMSW__) && wxUSE_UXTHEME && !defined(__WXUNIVERSAL__) #define wxHAS_SYSTEM_THEMED_CONTROL #endif diff --git a/src/aui/barartmsw.cpp b/src/aui/barartmsw.cpp index b479bc31a2..ee1b4b10e4 100644 --- a/src/aui/barartmsw.cpp +++ b/src/aui/barartmsw.cpp @@ -13,6 +13,8 @@ #pragma hdrstop #endif +#if wxUSE_AUI && wxUSE_UXTHEME + #ifndef WX_PRECOMP #include "wx/bitmap.h" #include "wx/dcclient.h" @@ -25,8 +27,6 @@ #include "wx/msw/uxtheme.h" #include "wx/msw/private.h" -#if wxUSE_AUI - wxAuiMSWToolBarArt::wxAuiMSWToolBarArt() { if ( wxUxThemeIsActive() ) @@ -470,4 +470,4 @@ int wxAuiMSWToolBarArt::ShowDropDown(wxWindow* wnd, return wxAuiGenericToolBarArt::ShowDropDown(wnd, items); } -#endif // wxUSE_AUI +#endif // wxUSE_AUI && wxUSE_UXTHEME diff --git a/src/aui/tabartmsw.cpp b/src/aui/tabartmsw.cpp index 9f17fa27fe..de069d1f4d 100644 --- a/src/aui/tabartmsw.cpp +++ b/src/aui/tabartmsw.cpp @@ -13,6 +13,8 @@ #pragma hdrstop #endif +#if wxUSE_AUI && wxUSE_UXTHEME && !defined(__WXUNIVERSAL__) + #ifndef WX_PRECOMP #include "wx/dc.h" #endif @@ -23,8 +25,6 @@ #include "wx/msw/private.h" #include "wx/renderer.h" -#if wxUSE_AUI && !defined(__WXUNIVERSAL__) - wxAuiMSWTabArt::wxAuiMSWTabArt() { m_closeBtnSize = wxDefaultSize; @@ -469,4 +469,4 @@ bool wxAuiMSWTabArt::IsThemed() const } -#endif // wxUSE_AUI +#endif // wxUSE_AUI && wxUSE_UXTHEME && !defined(__WXUNIVERSAL__) diff --git a/src/generic/richtooltipg.cpp b/src/generic/richtooltipg.cpp index b774341d33..1905538a08 100644 --- a/src/generic/richtooltipg.cpp +++ b/src/generic/richtooltipg.cpp @@ -47,7 +47,10 @@ #include "wx/textwrapper.h" #ifdef __WXMSW__ - #include "wx/msw/uxtheme.h" + #if wxUSE_UXTHEME + #include "wx/msw/uxtheme.h" + #define HAVE_MSW_THEME + #endif #endif // ---------------------------------------------------------------------------- @@ -86,7 +89,7 @@ public: // Determine the appropriate title font for the current platform. titleFont = labelTitle->GetFont(); -#ifdef __WXMSW__ +#ifdef HAVE_MSW_THEME // When using themes MSW tooltips use larger bluish version of the // normal font. if ( UseTooltipTheme() ) @@ -110,7 +113,7 @@ public: labelTitle->SetForegroundColour(wxRGBToColour(c)); } else -#endif // __WXMSW__ +#endif // HAVE_MSW_THEME { // Everything else, including "classic" MSW look uses just the // bold version of the base font. @@ -132,7 +135,7 @@ public: wxTextSizerWrapper wrapper(this); wxSizer* sizerText = wrapper.CreateSizer(message, -1 /* No wrapping */); -#ifdef __WXMSW__ +#ifdef HAVE_MSW_THEME if ( icon.IsOk() && UseTooltipTheme() ) { // Themed tooltips under MSW align the text with the title, not @@ -144,7 +147,7 @@ public: sizerText = sizerTextIndent; } -#endif // !__WXMSW__ +#endif // HAVE_MSW_THEME sizerTop->Add(sizerText, wxSizerFlags().DoubleBorder(wxLEFT|wxRIGHT|wxBOTTOM) .Centre()); @@ -167,7 +170,7 @@ public: if ( !colStart.IsOk() ) { // Determine the best colour(s) to use on our own. -#ifdef __WXMSW__ +#ifdef HAVE_MSW_THEME if ( UseTooltipTheme() ) { wxUxThemeHandle hTheme(GetParent(), L"TOOLTIP"); @@ -198,7 +201,7 @@ public: colEnd = wxRGBToColour(c2); } else -#endif // __WXMSW__ +#endif // HAVE_MSW_THEME { colStart = wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK); } @@ -270,26 +273,26 @@ protected: } private: -#ifdef __WXMSW__ +#ifdef HAVE_MSW_THEME // Returns non-NULL theme only if we're using Win7-style tooltips. static bool UseTooltipTheme() { // Even themed applications under XP still use "classic" tooltips. if ( wxGetWinVersion() <= wxWinVersion_XP ) return false; - else - return wxUxThemeIsActive(); + else + return wxUxThemeIsActive(); } -#endif // __WXMSW__ +#endif // HAVE_MSW_THEME // For now we just hard code the tip height, would be nice to do something // smarter in the future. static int GetTipHeight() { -#ifdef __WXMSW__ +#ifdef HAVE_MSW_THEME if ( UseTooltipTheme() ) return 20; -#endif // __WXMSW__ +#endif // HAVE_MSW_THEME return 15; } diff --git a/src/msw/combo.cpp b/src/msw/combo.cpp index 2923f575c7..c46abf2fa0 100644 --- a/src/msw/combo.cpp +++ b/src/msw/combo.cpp @@ -37,9 +37,7 @@ #include "wx/combo.h" #include "wx/msw/registry.h" -#if wxUSE_UXTHEME #include "wx/msw/uxtheme.h" -#endif #include "wx/msw/dc.h" #define NATIVE_TEXT_INDENT_XP 4 @@ -87,7 +85,6 @@ bool wxComboCtrl::Create(wxWindow *parent, if ( !border ) { -#if wxUSE_UXTHEME if ( wxUxThemeIsActive() ) { // For XP, have 1-width custom border, for older version use sunken @@ -95,7 +92,6 @@ bool wxComboCtrl::Create(wxWindow *parent, m_widthCustomBorder = 1; } else -#endif border = wxBORDER_SUNKEN; style = (style & ~(wxBORDER_MASK)) | border; @@ -112,10 +108,8 @@ bool wxComboCtrl::Create(wxWindow *parent, name) ) return false; -#if wxUSE_UXTHEME if ( wxUxThemeIsActive() && ::wxGetWinVersion() >= wxWinVersion_Vista ) m_iFlags |= wxCC_BUTTON_STAYS_DOWN |wxCC_BUTTON_COVERS_BORDER; -#endif if ( style & wxCC_STD_BUTTON ) m_iFlags |= wxCC_POPUP_ON_MOUSE_UP; diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp index f39af0763f..1c53d8de1d 100644 --- a/src/msw/menuitem.cpp +++ b/src/msw/menuitem.cpp @@ -165,7 +165,10 @@ class MenuDrawData public: // Wrapper around standard MARGINS structure providing some helper // functions and automatically initializing the margin fields to 0. - struct Margins : MARGINS + struct Margins +#if wxUSE_UXTHEME + : MARGINS +#endif // wxUSE_UXTHEME { Margins() { @@ -193,6 +196,12 @@ public: rect.right += cyTopHeight; rect.bottom += cyBottomHeight; } + +#if !wxUSE_UXTHEME + // When MARGINS struct is not available, we need to define the fields + // we use ourselves. + int cxLeftWidth, cxRightWidth, cyTopHeight, cyBottomHeight; +#endif // !wxUSE_UXTHEME }; Margins ItemMargin; // popup item margins From f170ab3b61bbe1576fc78e8e31c70f2d8bfab67b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 9 Dec 2018 00:35:27 +0100 Subject: [PATCH 21/77] Remove duplicate words s/new new/new/ --- docs/publicity/announce.txt | 4 ++-- docs/readme.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/publicity/announce.txt b/docs/publicity/announce.txt index bfa2e20ab1..cedfcfdb85 100644 --- a/docs/publicity/announce.txt +++ b/docs/publicity/announce.txt @@ -16,8 +16,8 @@ for the incomplete list of the most important ones. Here is the maximally condensed summary of the changes compared to 3.0: - Build system improvements: support for new compilers (MSVS 2017, g++ 8) and - OS versions (macOS 10.14 and its dark mode) as well as an entirely new new - CMake build system. + OS versions (macOS 10.14 and its dark mode) as well as an entirely new CMake + build system. - New features: support for mouse gesture events (GSoC 2017 project); non-integer font sizes and arbitrary font weights in wxFont; fractional pen widths in wxGraphicsContext; arbitrary label windows in wxStaticBox; markup diff --git a/docs/readme.txt b/docs/readme.txt index 8a5d0c649f..c84dcbb8cf 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -69,7 +69,7 @@ improvements and even more bug fixes to list them all, but here is the maximally condensed summary: - Build system improvements: support for new compilers (MSVS 2017, g++ 8) and - OS versions as well as an entirely new new CMake build system. + OS versions as well as an entirely new CMake build system. - New features: support for mouse gesture events (GSoC 2017 project); fractional pen widths in wxGraphicsContext; arbitrary label windows in wxStaticBox; markup in wxDataViewCtrl items text; better support for high DPI From ab1fd56977191d1dc5380b6bd775729c55074e2e Mon Sep 17 00:00:00 2001 From: Sebastian Walderich Date: Sat, 8 Dec 2018 20:46:08 +0100 Subject: [PATCH 22/77] Implement wxAuiNotebook::HitTest() Check if point is on window or a certain tab. Closes https://github.com/wxWidgets/wxWidgets/pull/1059 --- docs/changes.txt | 1 + src/aui/auibook.cpp | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index 70fc9f5c6d..cd22de9e52 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -144,6 +144,7 @@ All (GUI): - Adapt AUI colours to system colour changes (Daniel Kulp). - Fix removing and inserting pages in wxToolbook (Stefan Ziegler). - Fix bug in template selection in docview framework (jwiesemann). +- Implement wxAuiNotebook::HitTest() (Sebastian Walderich). wxGTK: diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp index 12afa3a9b6..bbba6cd33e 100644 --- a/src/aui/auibook.cpp +++ b/src/aui/auibook.cpp @@ -3359,10 +3359,37 @@ void wxAuiNotebook::SetPageSize (const wxSize& WXUNUSED(size)) wxFAIL_MSG("Not implemented for wxAuiNotebook"); } -int wxAuiNotebook::HitTest (const wxPoint& WXUNUSED(pt), long* WXUNUSED(flags)) const +int wxAuiNotebook::HitTest (const wxPoint &pt, long *flags) const { - wxFAIL_MSG("Not implemented for wxAuiNotebook"); - return wxNOT_FOUND; + wxWindow *w = NULL; + long position = wxBK_HITTEST_NOWHERE; + const wxAuiPaneInfoArray& all_panes = const_cast(m_mgr).GetAllPanes(); + const size_t pane_count = all_panes.GetCount(); + for (size_t i = 0; i < pane_count; ++i) + { + if (all_panes.Item(i).name == wxT("dummy")) + continue; + + wxTabFrame* tabframe = (wxTabFrame*) all_panes.Item(i).window; + if (tabframe->m_tab_rect.Contains(pt)) + { + wxPoint tabpos = tabframe->m_tabs->ScreenToClient(ClientToScreen(pt)); + if (tabframe->m_tabs->TabHitTest(tabpos.x, tabpos.y, &w)) + position = wxBK_HITTEST_ONITEM; + break; + } + else if (tabframe->m_rect.Contains(pt)) + { + w = tabframe->m_tabs->GetWindowFromIdx(tabframe->m_tabs->GetActivePage()); + if (w) + position = wxBK_HITTEST_ONPAGE; + break; + } + } + + if (flags) + *flags = position; + return w ? GetPageIndex(w) : wxNOT_FOUND; } int wxAuiNotebook::GetPageImage(size_t WXUNUSED(n)) const From a18fc6ce96fc2d8986d78a2322dc0e57924756dd Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 9 Dec 2018 16:09:54 +0100 Subject: [PATCH 23/77] Normalize line endings in wxwidgets.iss This file was a mix of DOS and Unix EOLs, convert it entirely to the former. No real changes. --- build/tools/wxwidgets.iss | 56 +++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/build/tools/wxwidgets.iss b/build/tools/wxwidgets.iss index ac503056b7..95c6bd2533 100644 --- a/build/tools/wxwidgets.iss +++ b/build/tools/wxwidgets.iss @@ -1,23 +1,23 @@ ; Script generated by the Inno Setup Script Wizard. ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! -#if GetEnv("INNO") != "" - #define WXW_DIR GetEnv("INNO") -#else - #define WXW_DIR "..\.." -#endif - -#if GetEnv("WXW_VER") == "Snapshot" - #define INFOFILE WXW_DIR + "\BuildGit.txt" - #define WX_VERSION "Snapshot" -#elif GetEnv("WXW_VER") != "" - #define INFOFILE WXW_DIR + "\docs\msw\install.txt" - #define WX_VERSION GetEnv("WXW_VER") +#if GetEnv("INNO") != "" + #define WXW_DIR GetEnv("INNO") #else - #error "WXW_VER environment variable must be defined." + #define WXW_DIR "..\.." #endif -#define SETUPFILENAME "wxMSW-" + GetEnv("WXW_VER") + "-Setup" +#if GetEnv("WXW_VER") == "Snapshot" + #define INFOFILE WXW_DIR + "\BuildGit.txt" + #define WX_VERSION "Snapshot" +#elif GetEnv("WXW_VER") != "" + #define INFOFILE WXW_DIR + "\docs\msw\install.txt" + #define WX_VERSION GetEnv("WXW_VER") +#else + #error "WXW_VER environment variable must be defined." +#endif + +#define SETUPFILENAME "wxMSW-" + GetEnv("WXW_VER") + "-Setup" @@ -32,22 +32,22 @@ DefaultDirName={sd}\wxWidgets-{#WX_VERSION} DefaultGroupName=wxWidgets {#WX_VERSION} UsePreviousAppDir=no DisableProgramGroupPage=yes -LicenseFile={#WXW_DIR}\docs\licence.txt -InfoBeforeFile={#WXW_DIR}\docs\readme.txt -InfoAfterFile={#INFOFILE} -OutputDir={#WXW_DIR}\.. -OutputBaseFilename={#SETUPFILENAME} -PrivilegesRequired=none -SetupIconFile={#WXW_DIR}\art\wxwin.ico +LicenseFile={#WXW_DIR}\docs\licence.txt +InfoBeforeFile={#WXW_DIR}\docs\readme.txt +InfoAfterFile={#INFOFILE} +OutputDir={#WXW_DIR}\.. +OutputBaseFilename={#SETUPFILENAME} +PrivilegesRequired=none +SetupIconFile={#WXW_DIR}\art\wxwin.ico Compression=lzma SolidCompression=yes - -[Files] -; source files -Source: "{#WXW_DIR}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs - -[INI] -Filename: "{app}\wx.url"; Section: "InternetShortcut"; Key: "URL"; String: "https://www.wxwidgets.org" + +[Files] +; source files +Source: "{#WXW_DIR}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs + +[INI] +Filename: "{app}\wx.url"; Section: "InternetShortcut"; Key: "URL"; String: "https://www.wxwidgets.org" [Icons] Name: "{group}\{cm:ProgramOnTheWeb,wxWidgets}"; Filename: "{app}\wx.url" From 653f9b14f087eb589af0155dc4e4e079d56cd1a2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 9 Dec 2018 16:18:06 +0100 Subject: [PATCH 24/77] Don't reference inexistent docs/msw/install.txt in wxwidgets.iss Use install.md which is probably not ideal, but it at least allows Inno Setup to successfully build the installer. --- build/tools/wxwidgets.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/tools/wxwidgets.iss b/build/tools/wxwidgets.iss index 95c6bd2533..8feab2250a 100644 --- a/build/tools/wxwidgets.iss +++ b/build/tools/wxwidgets.iss @@ -54,7 +54,7 @@ Name: "{group}\{cm:ProgramOnTheWeb,wxWidgets}"; Filename: "{app}\wx.url" Name: {group}\wxWidgets Manual; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths Name: {group}\Changes; Filename: {app}\docs\changes.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths Name: {group}\Readme; Filename: {app}\docs\readme.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths -Name: {group}\Compiling wxWidgets; Filename: {app}\docs\msw\install.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths +Name: {group}\Setting up wxWidgets; Filename: {app}\docs\msw\install.md; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths Name: "{group}\Uninstall wxWidgets {#WX_VERSION}"; Filename: "{uninstallexe}" From f456f52493d602bd7a207804ea763fd128bce17d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 9 Dec 2018 16:38:32 +0100 Subject: [PATCH 25/77] Add a text file to be shown after finishing wxMSW installation We used docs/msw/install.txt for this previously, but it was too long to be comfortably viewed in the installation wizard and also incidentally doesn't exist any more, so add a new, short file just referring the user to its replacement. --- build/tools/wxwidgets.iss | 4 +--- docs/msw/setup_after.txt | 9 +++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 docs/msw/setup_after.txt diff --git a/build/tools/wxwidgets.iss b/build/tools/wxwidgets.iss index 8feab2250a..67c8dc3adf 100644 --- a/build/tools/wxwidgets.iss +++ b/build/tools/wxwidgets.iss @@ -8,10 +8,8 @@ #endif #if GetEnv("WXW_VER") == "Snapshot" - #define INFOFILE WXW_DIR + "\BuildGit.txt" #define WX_VERSION "Snapshot" #elif GetEnv("WXW_VER") != "" - #define INFOFILE WXW_DIR + "\docs\msw\install.txt" #define WX_VERSION GetEnv("WXW_VER") #else #error "WXW_VER environment variable must be defined." @@ -34,7 +32,7 @@ UsePreviousAppDir=no DisableProgramGroupPage=yes LicenseFile={#WXW_DIR}\docs\licence.txt InfoBeforeFile={#WXW_DIR}\docs\readme.txt -InfoAfterFile={#INFOFILE} +InfoAfterFile={#WXW_DIR}\docs\msw\setup_after.txt OutputDir={#WXW_DIR}\.. OutputBaseFilename={#SETUPFILENAME} PrivilegesRequired=none diff --git a/docs/msw/setup_after.txt b/docs/msw/setup_after.txt new file mode 100644 index 0000000000..d539cea2d2 --- /dev/null +++ b/docs/msw/setup_after.txt @@ -0,0 +1,9 @@ +wxWidgets was installed successfully! + +Please note: before using wxWidgets in your application, +you must build the library using the same compiler you +use for building your program. + +Please see docs/msw/install.md file in the installation +directory for the detailed instructions about how to build +wxWidgets and use it from your application. From 33cb18f5e1cdb172cb280ca6bf1cd68b55f845a5 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 9 Dec 2018 16:21:40 +0100 Subject: [PATCH 26/77] Link to the installation instructions from the main manual page Installation is traditionally the worst (or at least the first) problem for new wxWidgets users, so make it simpler to find these instructions. --- docs/doxygen/mainpages/manual.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/doxygen/mainpages/manual.h b/docs/doxygen/mainpages/manual.h index 5251aebe80..f7b0866269 100644 --- a/docs/doxygen/mainpages/manual.h +++ b/docs/doxygen/mainpages/manual.h @@ -16,18 +16,17 @@ @date December 10, 2018 -@n - Welcome to wxWidgets, a stable and powerful open source framework for developing native cross-platform GUI applications in C++! -@n - If you are new to wxWidgets, please start with the @ref page_introduction -and follow with the @ref page_topics, with maybe a look at -@ref page_samples as you go. If you are already familiar with wxWidgets, -please read about @ref overview_changes_since28 "the changes" in the latest -version compared to 2.8 series. And you can also follow the links in the +and follow with the @ref page_topics, with maybe a look at @ref page_samples as +you go. Installation instructions for various platforms are available from the +@ref page_port page. + +If you are already familiar with wxWidgets and are upgrading from an older +release, please read about @ref overview_changes_since28 "the changes" in the +latest version compared to 2.8 series. And you can also follow the links in the reference section or jump directly to the alphabetical list of classes to find out more about the topic you are interested in. From 2b612603d35c152a8ba0fc43ed1f7597c02d06c2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 9 Dec 2018 16:51:29 +0100 Subject: [PATCH 27/77] Give an error from build/tools/post-release.sh if it didn't work The script gave a misleading success message even if it didn't find anything to update. --- build/tools/post-release.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build/tools/post-release.sh b/build/tools/post-release.sh index dc1ba31a8d..90199a8d89 100755 --- a/build/tools/post-release.sh +++ b/build/tools/post-release.sh @@ -8,6 +8,11 @@ topdir=`dirname $0`/../.. # Build the file list for sha1sums, from `docs/release.md` declare -a files=(`sed -n '/^## Download Verification/,/^## Binaries/p' $topdir/docs/release.md | sed -n -E 's/^\s*0{40}\s{2}(wx.*)/\1/p'`) +if [ -z "$files" ]; then + echo "No lines with SHA-1 sums, has release.md format changed?" >&2 + exit 1 +fi + # Get the release version unless it's given explicitly on the command line. if [ -z $1 ]; then ver_string=`grep '#define wxVERSION_STRING ' $topdir/include/wx/version.h | sed 's/^.*"wxWidgets \(.*\)")/\1/'` From b8f791877eafdbd48e99d38b7c24e9683f7ec2f8 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 9 Dec 2018 16:52:40 +0100 Subject: [PATCH 28/77] Fix SHA-1 update script to work with the current release.md Change the regex used to find the lines to update to actually find them. --- build/tools/post-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/tools/post-release.sh b/build/tools/post-release.sh index 90199a8d89..83806f0694 100755 --- a/build/tools/post-release.sh +++ b/build/tools/post-release.sh @@ -6,7 +6,7 @@ set -e topdir=`dirname $0`/../.. # Build the file list for sha1sums, from `docs/release.md` -declare -a files=(`sed -n '/^## Download Verification/,/^## Binaries/p' $topdir/docs/release.md | sed -n -E 's/^\s*0{40}\s{2}(wx.*)/\1/p'`) +declare -a files=(`sed -n '/^To verify your download/,/^## Binaries/p' $topdir/docs/release.md | sed -n -E 's/^\s*0{40}\s{2}(wx.*)/\1/p'`) if [ -z "$files" ]; then echo "No lines with SHA-1 sums, has release.md format changed?" >&2 From d06720d4c9088c60962d5e7e3ba0a45688580b40 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 9 Dec 2018 16:53:25 +0100 Subject: [PATCH 29/77] Update SHA-1 sums for 3.1.2 release source archives This is the result of running ./build/tools/post-release.sh --- docs/release.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/release.md b/docs/release.md index 7ce86bec92..82b9958762 100644 --- a/docs/release.md +++ b/docs/release.md @@ -17,14 +17,14 @@ Finally, Microsoft Windows users may download [Setup.exe file](https://github.co To verify your download please use the following SHA-1 checksums: - 0000000000000000000000000000000000000000 wxMSW-3.1.2-Setup.exe - 0000000000000000000000000000000000000000 wxWidgets-3.1.2-docs-chm.zip - 0000000000000000000000000000000000000000 wxWidgets-3.1.2-docs-html.tar.bz2 - 0000000000000000000000000000000000000000 wxWidgets-3.1.2-docs-html.zip - 0000000000000000000000000000000000000000 wxWidgets-3.1.2-headers.7z - 0000000000000000000000000000000000000000 wxWidgets-3.1.2.7z - 0000000000000000000000000000000000000000 wxWidgets-3.1.2.tar.bz2 - 0000000000000000000000000000000000000000 wxWidgets-3.1.2.zip + 85ac5b18de191d9d5504b7106466b21b64e7249d wxMSW-3.1.2-Setup.exe + 40a1469a13023f12a56bcbcfec2c1172fe1b86d6 wxWidgets-3.1.2-docs-chm.zip + 393f6bca6c5c4fc178a9312fae5bddc04233b7bb wxWidgets-3.1.2-docs-html.tar.bz2 + e51475ec38628b7080af01963bbf43f2151121c8 wxWidgets-3.1.2-docs-html.zip + e6335af2fc8c9058d442bbb7ef456c3c5594e7fe wxWidgets-3.1.2-headers.7z + 0737ccc29f8d625496e425cb7d0ff8207343609b wxWidgets-3.1.2.7z + 29cbbba946d2a7b4d28ca1db12315810cc8de74d wxWidgets-3.1.2.tar.bz2 + ec7114242f2df2706bb90bd76fa3b79f83f1b05d wxWidgets-3.1.2.zip ## Binaries From edbee125f954d31529578f1306589a1533b70bd0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 9 Dec 2018 16:55:42 +0100 Subject: [PATCH 30/77] Slightly improve instructions for updating docs/release.md It makes more sense to update it manually once and then run the script rather than partially updating it manually first, then updating it again and then running the script. --- docs/contributing/how-to-release.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/contributing/how-to-release.md b/docs/contributing/how-to-release.md index 18d59664f8..780396db92 100644 --- a/docs/contributing/how-to-release.md +++ b/docs/contributing/how-to-release.md @@ -51,7 +51,7 @@ and then run it using the new DLLs. automatically, but please also review and update the contents of the README and announcement text. * Update `docs/readme.txt`: version needs to be changed, content updated. - * Update `docs/release.md`: the release sha1sums should be set to zeroes. + * Update `docs/release.md`: also version and reset SHA-1 sums to zeroes. * Put a date on the release line in `docs/changes.txt`. * Update the date in the manual (`docs/doxygen/mainpages/manual.h`). * Update the release announcement post in `docs/publicity/announce.txt`. @@ -91,10 +91,9 @@ ensure you have the appropriate tag or commit checked out. and copy/move it to the same directory. -5. Update the version in `docs/release.md` (typically just a global search and - replace) and run `./build/tools/post-release.sh` to update the sha1sums in - it, then commit the changes. Notice that when making an RC, the version must - be explicitly specified on this script command line. +5. Run `./build/tools/post-release.sh` to update the SHA-1 sums in + `docs/release.md`, then commit the changes. Notice that when making an RC, + the version must be explicitly specified on this script command line. ## Uploading From dfec7aa0c08617ed61fc1ee04551aea19dc6abd0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 9 Dec 2018 01:01:49 +0100 Subject: [PATCH 31/77] Make disabling the window before creating it actually work Disabling a window before actually creating it ought to work, similarly to hiding a window before creating it which can be used to avoid showing the window on screen at all, even briefly. However it didn't under MSW where the window was disabled from wxWidgets point of view, but not at the MSW level. Fix this by accounting for the enabled state in MSWGetStyle(). Closes #16385. --- docs/changes.txt | 8 ++++++++ src/msw/window.cpp | 3 +++ tests/controls/buttontest.cpp | 17 +++++++++++++++-- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index ea37991c44..5ce2c6c4c2 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -102,6 +102,14 @@ Changes in behaviour which may result in build errors removing its name. +3.1.?: (released 2012-??-??) +---------------------------- + +All (GUI): + +- Make disabling the window before creating it actually work. + + 3.1.2: (released 2018-12-10) ---------------------------- diff --git a/src/msw/window.cpp b/src/msw/window.cpp index e17b851b59..609f6e8c19 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -1518,6 +1518,9 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const // wxTopLevelWindow) should remove WS_CHILD in their MSWGetStyle() WXDWORD style = WS_CHILD; + if ( !IsThisEnabled() ) + style |= WS_DISABLED; + // using this flag results in very significant reduction in flicker, // especially with controls inside the static boxes (as the interior of the // box is not redrawn twice), but sometimes results in redraw problems, so diff --git a/tests/controls/buttontest.cpp b/tests/controls/buttontest.cpp index 764de5b28e..4f84523828 100644 --- a/tests/controls/buttontest.cpp +++ b/tests/controls/buttontest.cpp @@ -102,8 +102,21 @@ void ButtonTestCase::Disabled() wxUIActionSimulator sim; - //In this test we disable the button and check events are not sent - m_button->Disable(); + // In this test we disable the button and check events are not sent and we + // do it once by disabling the previously enabled button and once by + // creating the button in the disabled state. + SECTION("Disable after creation") + { + m_button->Disable(); + } + + SECTION("Create disabled") + { + delete m_button; + m_button = new wxButton(); + m_button->Disable(); + m_button->Create(wxTheApp->GetTopWindow(), wxID_ANY, "wxButton"); + } sim.MouseMove(m_button->GetScreenPosition() + wxPoint(10, 10)); wxYield(); From 5ba1ba1162b51a838f4fe2cbfae6b7bdff583ce6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 9 Dec 2018 01:15:08 +0100 Subject: [PATCH 32/77] Fix creating disabled windows in wxGTK too Don't forbid calling Enable() before creating the window and just do nothing in this case and do disable the window when it's actually created if it's supposed to be disabled. Note that this doesn't work for classes overriding Enable() directly, such as wxButton or wxCheckBox, currently. --- src/gtk/window.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index e440422ab7..32340aaa62 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -2913,6 +2913,11 @@ void wxWindowGTK::PostCreation() SetLayoutDirection(wxLayout_Default); + // if the window had been disabled before being created, it should be + // created in the initially disabled state + if ( !m_isEnabled ) + DoEnable(false); + // unless the window was created initially hidden (i.e. Hide() had been // called before Create()), we should show it at GTK+ level as well if (m_isShown) @@ -4196,7 +4201,12 @@ bool wxWindowGTK::IsShown() const void wxWindowGTK::DoEnable( bool enable ) { - wxCHECK_RET( (m_widget != NULL), wxT("invalid window") ); + if ( !m_widget ) + { + // The window can be disabled before being created, so just don't do + // anything in this case and, in particular, don't assert. + return; + } gtk_widget_set_sensitive( m_widget, enable ); if (m_wxwindow && (m_wxwindow != m_widget)) From 96f3832d52e3c6bfd1fd351d2fdbabc6c48a19e8 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 9 Dec 2018 01:31:43 +0100 Subject: [PATCH 33/77] Override DoEnable() instead of Enable() in wxGTK controls This is slightly simpler, as it doesn't require checking whether the control state really changes or not (it always does if DoEnable() is called) and allows disabling the controls before creating them, e.g. code like wxButton* const b = new wxButton(); b->Disable(); b->Create(this, wxID_OK); works as expected now instead of spewing GTK+ errors. --- include/wx/gtk/anybutton.h | 4 ++-- include/wx/gtk/checkbox.h | 3 ++- include/wx/gtk/radiobox.h | 2 ++ include/wx/gtk/radiobut.h | 3 ++- include/wx/gtk/spinbutt.h | 4 ++-- include/wx/gtk/textctrl.h | 3 ++- src/gtk/anybutton.cpp | 11 ++++++----- src/gtk/checkbox.cpp | 10 +++++----- src/gtk/radiobox.cpp | 16 ++++++++++++---- src/gtk/radiobut.cpp | 10 +++++----- src/gtk/spinbutt.cpp | 10 +++++----- src/gtk/textctrl.cpp | 13 +++++-------- 12 files changed, 50 insertions(+), 39 deletions(-) diff --git a/include/wx/gtk/anybutton.h b/include/wx/gtk/anybutton.h index ad0357a659..0b149ec085 100644 --- a/include/wx/gtk/anybutton.h +++ b/include/wx/gtk/anybutton.h @@ -23,8 +23,6 @@ public: m_isPressed = false; } - virtual bool Enable( bool enable = true ) wxOVERRIDE; - // implementation // -------------- @@ -41,6 +39,8 @@ public: protected: virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; + virtual void DoEnable(bool enable) wxOVERRIDE; + virtual wxBitmap DoGetBitmap(State which) const wxOVERRIDE; virtual void DoSetBitmap(const wxBitmap& bitmap, State which) wxOVERRIDE; virtual void DoSetBitmapPosition(wxDirection dir) wxOVERRIDE; diff --git a/include/wx/gtk/checkbox.h b/include/wx/gtk/checkbox.h index 8068f0b556..e16bc4f3ff 100644 --- a/include/wx/gtk/checkbox.h +++ b/include/wx/gtk/checkbox.h @@ -39,7 +39,6 @@ public: bool GetValue() const wxOVERRIDE; virtual void SetLabel( const wxString& label ) wxOVERRIDE; - virtual bool Enable( bool enable = true ) wxOVERRIDE; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -52,6 +51,8 @@ protected: virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; + virtual void DoEnable(bool enable) wxOVERRIDE; + void DoSet3StateValue(wxCheckBoxState state) wxOVERRIDE; wxCheckBoxState DoGet3StateValue() const wxOVERRIDE; diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h index 9e7df61a93..f38f82a599 100644 --- a/include/wx/gtk/radiobox.h +++ b/include/wx/gtk/radiobox.h @@ -141,6 +141,8 @@ protected: virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; + virtual void DoEnable(bool enable) wxOVERRIDE; + virtual bool GTKNeedsToFilterSameWindowFocus() const wxOVERRIDE { return true; } virtual bool GTKWidgetNeedsMnemonic() const wxOVERRIDE; diff --git a/include/wx/gtk/radiobut.h b/include/wx/gtk/radiobut.h index 340c671c1e..7ef6a6a162 100644 --- a/include/wx/gtk/radiobut.h +++ b/include/wx/gtk/radiobut.h @@ -41,7 +41,6 @@ public: virtual void SetLabel(const wxString& label) wxOVERRIDE; virtual void SetValue(bool val); virtual bool GetValue() const; - virtual bool Enable( bool enable = true ) wxOVERRIDE; static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -52,6 +51,8 @@ protected: virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE; virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; + virtual void DoEnable(bool enable) wxOVERRIDE; + private: typedef wxControl base_type; diff --git a/include/wx/gtk/spinbutt.h b/include/wx/gtk/spinbutt.h index ae974200b7..437198173c 100644 --- a/include/wx/gtk/spinbutt.h +++ b/include/wx/gtk/spinbutt.h @@ -44,8 +44,6 @@ public: static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - virtual bool Enable( bool enable = true ) wxOVERRIDE; - // implementation int m_pos; @@ -56,6 +54,8 @@ protected: virtual wxSize DoGetBestSize() const wxOVERRIDE; virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE; + virtual void DoEnable(bool enable) wxOVERRIDE; + private: typedef wxSpinButtonBase base_type; diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h index f27d38cfa7..d411188a66 100644 --- a/include/wx/gtk/textctrl.h +++ b/include/wx/gtk/textctrl.h @@ -95,7 +95,6 @@ public: // Overridden wxWindow methods virtual void SetWindowStyleFlag( long style ) wxOVERRIDE; - virtual bool Enable( bool enable = true ) wxOVERRIDE; // Implementation from now on void OnDropFiles( wxDropFilesEvent &event ); @@ -178,6 +177,8 @@ protected: private: void Init(); + virtual void DoEnable(bool enable) wxOVERRIDE; + // overridden wxTextEntry virtual methods virtual GtkEditable *GetEditable() const wxOVERRIDE; virtual GtkEntry *GetEntry() const wxOVERRIDE; diff --git a/src/gtk/anybutton.cpp b/src/gtk/anybutton.cpp index 0742eed15f..9859016a37 100644 --- a/src/gtk/anybutton.cpp +++ b/src/gtk/anybutton.cpp @@ -69,10 +69,13 @@ wxgtk_button_released_callback(GtkWidget *WXUNUSED(widget), wxAnyButton *button) // wxAnyButton //----------------------------------------------------------------------------- -bool wxAnyButton::Enable( bool enable ) +void wxAnyButton::DoEnable(bool enable) { - if (!base_type::Enable(enable)) - return false; + // See wxWindow::DoEnable() + if ( !m_widget ) + return; + + base_type::DoEnable(enable); gtk_widget_set_sensitive(gtk_bin_get_child(GTK_BIN(m_widget)), enable); @@ -80,8 +83,6 @@ bool wxAnyButton::Enable( bool enable ) GTKFixSensitivity(); GTKUpdateBitmap(); - - return true; } GdkWindow *wxAnyButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp index 401f94358d..d11c7ef205 100644 --- a/src/gtk/checkbox.cpp +++ b/src/gtk/checkbox.cpp @@ -222,17 +222,17 @@ void wxCheckBox::SetLabel( const wxString& label ) GTKSetLabelForLabel(GTK_LABEL(m_widgetLabel), label); } -bool wxCheckBox::Enable( bool enable ) +void wxCheckBox::DoEnable(bool enable) { - if (!base_type::Enable(enable)) - return false; + if ( !m_widgetLabel ) + return; + + base_type::DoEnable(enable); gtk_widget_set_sensitive( m_widgetLabel, enable ); if (enable) GTKFixSensitivity(); - - return true; } void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style) diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp index b75e127ecd..c93fde74d2 100644 --- a/src/gtk/radiobox.cpp +++ b/src/gtk/radiobox.cpp @@ -487,8 +487,18 @@ void wxRadioBox::SetString(unsigned int item, const wxString& label) bool wxRadioBox::Enable( bool enable ) { - if ( !wxControl::Enable( enable ) ) - return false; + // Explicitly forward to the base class just because we need to override + // this function to prevent it from being hidden by Enable(int, bool) + // overload. + return wxControl::Enable(enable); +} + +void wxRadioBox::DoEnable(bool enable) +{ + if ( !m_widget ) + return; + + wxControl::DoEnable(enable); wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); while (node) @@ -503,8 +513,6 @@ bool wxRadioBox::Enable( bool enable ) if (enable) GTKFixSensitivity(); - - return true; } bool wxRadioBox::Enable(unsigned int item, bool enable) diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp index 9b87a178ad..b77a52cdd6 100644 --- a/src/gtk/radiobut.cpp +++ b/src/gtk/radiobut.cpp @@ -149,17 +149,17 @@ bool wxRadioButton::GetValue() const return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widget)) != 0; } -bool wxRadioButton::Enable( bool enable ) +void wxRadioButton::DoEnable(bool enable) { - if (!base_type::Enable(enable)) - return false; + if ( !m_widget ) + return; + + base_type::DoEnable(enable); gtk_widget_set_sensitive(gtk_bin_get_child(GTK_BIN(m_widget)), enable); if (enable) GTKFixSensitivity(); - - return true; } void wxRadioButton::DoApplyWidgetStyle(GtkRcStyle *style) diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp index a0a3ebef55..56f86fb1f0 100644 --- a/src/gtk/spinbutt.cpp +++ b/src/gtk/spinbutt.cpp @@ -173,16 +173,16 @@ void wxSpinButton::SetRange(int minVal, int maxVal) GtkEnableEvents(); } -bool wxSpinButton::Enable( bool enable ) +void wxSpinButton::DoEnable(bool enable) { - if (!base_type::Enable(enable)) - return false; + if ( !m_widget ) + return; + + base_type::DoEnable(enable); // Work around lack of visual update when enabling if (enable) GTKFixSensitivity(false /* fix even if not under mouse */); - - return true; } void wxSpinButton::GtkDisableEvents() const diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index b8551d37c7..fe47602ac6 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -1350,17 +1350,14 @@ void wxTextCtrl::SetEditable( bool editable ) } } -bool wxTextCtrl::Enable( bool enable ) +void wxTextCtrl::DoEnable(bool enable) { - if (!wxWindowBase::Enable(enable)) - { - // nothing to do - return false; - } + if ( !m_text ) + return; + + wxTextCtrlBase::DoEnable(enable); gtk_widget_set_sensitive( m_text, enable ); - - return true; } void wxTextCtrl::MarkDirty() From 0de31f03a1ad63f8b779c8a85a8ffc08ee57714f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 9 Dec 2018 01:48:49 +0100 Subject: [PATCH 34/77] Document that Enable() can be called before creating the window Explicitly mention that calling Enable() for a window which hasn't been created yet is allowed. --- interface/wx/window.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/interface/wx/window.h b/interface/wx/window.h index 97184e1c28..64b3c1d58d 100644 --- a/interface/wx/window.h +++ b/interface/wx/window.h @@ -2834,6 +2834,14 @@ public: disabled, all of its children are disabled as well and they are reenabled again when the parent is. + A window can be created initially disabled by calling this method on it + @e before calling Create() to create the actual underlying window, e.g. + @code + wxWindow* w = new MyWindow(); // Note: default ctor is used here. + w->Enable(false); + w->Create(parent, ... all the usual non-default ctor arguments ...); + @endcode + @param enable If @true, enables the window for input. If @false, disables the window. From d8a41187eda8ff47baab5e1a6d1ec3e189973ece Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 10 Dec 2018 18:35:48 +0100 Subject: [PATCH 35/77] Update "How to make releases" instructions Remove update steps for wxBlog (because it's redundant with the news post on www.wxwidgets.org now that both are hosted at the same site), Google+ (because of its extinction) and Buildbot (because we're going to stop using it soon anyhow). Add a step for updating the list of compilers used for building binaries. --- docs/contributing/how-to-release.md | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/docs/contributing/how-to-release.md b/docs/contributing/how-to-release.md index 780396db92..03531fe6d0 100644 --- a/docs/contributing/how-to-release.md +++ b/docs/contributing/how-to-release.md @@ -120,28 +120,23 @@ Update https://www.wxwidgets.org: * Update release information (at least `version` and `released`) in `_data/relases.yml`. * Download information can then be updated by running `update_release_info.rb`. This will update the asset information from GitHub. +* Update the list of compilers used for making MSW binaries in + `downloads/index.md` if necessary (note that there is no need to update + anything else, the page will dynamically show the release files with the + specified prefixes). * Add a news item. Usually a news item is enough but something more can be called for for major releases Post `docs/publicity/announce.txt` at least to wx-announce@googlegroups.com and to wx-users. -Submit a link to https://www.reddit.com/r/programming +Submit a link to https://www.reddit.com/r/cpp or r/programming (depending on +the release importance). -Submit to https://isocpp.org/blog/suggest +Submit to https://isocpp.org/blog/suggest (need to be logged in to do it). For major releases, submit the announcement to https://slashdot.org/submission -Modify the links at downloads/index.html to point to the new release. Also -update the release date on this page. - -Also update docs/index.htm for the minor or major (i.e. not micro) releases. - -Post to wxBlog if necessary. - -Create a new post on our official Google+ page here: -https://plus.google.com/+wxwidgets/ (contact Bryan for access) - ## Version Updates Trac: mark the milestone corresponding to the release as completed and add a @@ -156,9 +151,6 @@ with x.y.z+1 (minor or major versions updates require manual intervention) and rerun both `bakefile_gen` and `autoconf` afterwards to update the version in the generated files too. -Update `master.cfg` in [wx/buildbot](https://github.com/wxWidgets/buildbot) -repository after a minor or major version change. - ## MSW Visual Studio Official Builds To build official x86 and x64 shared binaries the following are prerequisites: From c0cb5cacd9632895ec736a1a6e002b685a8233fe Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 10 Dec 2018 18:41:54 +0100 Subject: [PATCH 36/77] Don't try updating version in non-existent docs/msw/install.txt This file doesn't exist any more and install.md which replaced it doesn't contain any references to the version. --- docs/contributing/about-version-numbers.md | 1 - misc/scripts/inc_release | 3 --- 2 files changed, 4 deletions(-) diff --git a/docs/contributing/about-version-numbers.md b/docs/contributing/about-version-numbers.md index c2dc21b184..7c6ea11aa1 100644 --- a/docs/contributing/about-version-numbers.md +++ b/docs/contributing/about-version-numbers.md @@ -23,7 +23,6 @@ Here is the list of files that need to be updated: docs/readme.txt (date needs manual editing) [NOT UPDATED AUTOMATICALLY] docs/doxygen/Doxyfile (PROJECT_NUMBER and DOCSET_FEEDNAME) docs/doxygen/mainpages/manual.h (just date) [NOT UPDATED AUTOMATICALLY] - docs/msw/install.txt {major release only} include/wx/version.h include/wx/osx/config_xcode.h samples/docview/Info.plist diff --git a/misc/scripts/inc_release b/misc/scripts/inc_release index 4a81ad9d91..00bd8eee95 100755 --- a/misc/scripts/inc_release +++ b/misc/scripts/inc_release @@ -83,9 +83,6 @@ run_sed docs/readme.txt \ "/\//s/$ver_for_sed/$ver_string_new/" \ "/naming: while/s/$ver_for_sed/$ver_string_new/" -run_sed docs/msw/install.txt \ - "/^wxWidgets\/releases\//s/$ver_for_sed/$ver_string_new/" - run_sed docs/doxygen/Doxyfile \ "/^PROJECT_NUMBER/s/$ver_for_sed/$ver_string_new/" From e1185d8bf0785e7d152d2554f5bddae741daaa02 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 10 Dec 2018 18:43:43 +0100 Subject: [PATCH 37/77] Increment version number to 3.1.3 Done by running misc/scripts/inc_release, manually updating version.bkl, rebaking and rerunning autoconf. --- Makefile.in | 16 ++++++------ build/bakefiles/version.bkl | 2 +- build/msw/makefile.bcc | 4 +-- build/msw/makefile.gcc | 4 +-- build/msw/makefile.vc | 4 +-- build/msw/wx_setup.props | 2 +- build/msw/wx_vc7_adv.vcproj | 16 ++++++------ build/msw/wx_vc7_aui.vcproj | 16 ++++++------ build/msw/wx_vc7_base.vcproj | 16 ++++++------ build/msw/wx_vc7_core.vcproj | 16 ++++++------ build/msw/wx_vc7_gl.vcproj | 16 ++++++------ build/msw/wx_vc7_html.vcproj | 16 ++++++------ build/msw/wx_vc7_media.vcproj | 16 ++++++------ build/msw/wx_vc7_net.vcproj | 16 ++++++------ build/msw/wx_vc7_propgrid.vcproj | 16 ++++++------ build/msw/wx_vc7_qa.vcproj | 16 ++++++------ build/msw/wx_vc7_ribbon.vcproj | 16 ++++++------ build/msw/wx_vc7_richtext.vcproj | 16 ++++++------ build/msw/wx_vc7_stc.vcproj | 16 ++++++------ build/msw/wx_vc7_webview.vcproj | 16 ++++++------ build/msw/wx_vc7_xml.vcproj | 16 ++++++------ build/msw/wx_vc7_xrc.vcproj | 16 ++++++------ build/msw/wx_vc8_adv.vcproj | 32 ++++++++++++------------ build/msw/wx_vc8_aui.vcproj | 32 ++++++++++++------------ build/msw/wx_vc8_base.vcproj | 32 ++++++++++++------------ build/msw/wx_vc8_core.vcproj | 32 ++++++++++++------------ build/msw/wx_vc8_gl.vcproj | 32 ++++++++++++------------ build/msw/wx_vc8_html.vcproj | 32 ++++++++++++------------ build/msw/wx_vc8_media.vcproj | 32 ++++++++++++------------ build/msw/wx_vc8_net.vcproj | 32 ++++++++++++------------ build/msw/wx_vc8_propgrid.vcproj | 32 ++++++++++++------------ build/msw/wx_vc8_qa.vcproj | 32 ++++++++++++------------ build/msw/wx_vc8_ribbon.vcproj | 32 ++++++++++++------------ build/msw/wx_vc8_richtext.vcproj | 32 ++++++++++++------------ build/msw/wx_vc8_stc.vcproj | 32 ++++++++++++------------ build/msw/wx_vc8_webview.vcproj | 32 ++++++++++++------------ build/msw/wx_vc8_xml.vcproj | 32 ++++++++++++------------ build/msw/wx_vc8_xrc.vcproj | 32 ++++++++++++------------ build/msw/wx_vc9_adv.vcproj | 32 ++++++++++++------------ build/msw/wx_vc9_aui.vcproj | 32 ++++++++++++------------ build/msw/wx_vc9_base.vcproj | 32 ++++++++++++------------ build/msw/wx_vc9_core.vcproj | 32 ++++++++++++------------ build/msw/wx_vc9_gl.vcproj | 32 ++++++++++++------------ build/msw/wx_vc9_html.vcproj | 32 ++++++++++++------------ build/msw/wx_vc9_media.vcproj | 32 ++++++++++++------------ build/msw/wx_vc9_net.vcproj | 32 ++++++++++++------------ build/msw/wx_vc9_propgrid.vcproj | 32 ++++++++++++------------ build/msw/wx_vc9_qa.vcproj | 32 ++++++++++++------------ build/msw/wx_vc9_ribbon.vcproj | 32 ++++++++++++------------ build/msw/wx_vc9_richtext.vcproj | 32 ++++++++++++------------ build/msw/wx_vc9_stc.vcproj | 32 ++++++++++++------------ build/msw/wx_vc9_webview.vcproj | 32 ++++++++++++------------ build/msw/wx_vc9_xml.vcproj | 32 ++++++++++++------------ build/msw/wx_vc9_xrc.vcproj | 32 ++++++++++++------------ build/osx/wxvers.xcconfig | 2 +- build/tools/msvs/getversion.bat | 2 +- configure | 20 +++++++-------- configure.in | 4 +-- demos/bombs/Makefile.in | 2 +- demos/forty/Makefile.in | 2 +- demos/fractal/Makefile.in | 2 +- demos/life/Makefile.in | 2 +- demos/poem/Makefile.in | 2 +- docs/doxygen/Doxyfile | 2 +- docs/readme.txt | 8 +++--- include/wx/osx/config_xcode.h | 4 +-- include/wx/version.h | 4 +-- samples/access/Makefile.in | 2 +- samples/animate/Makefile.in | 2 +- samples/artprov/Makefile.in | 2 +- samples/aui/Makefile.in | 2 +- samples/calendar/Makefile.in | 2 +- samples/caret/Makefile.in | 2 +- samples/clipboard/Makefile.in | 2 +- samples/collpane/Makefile.in | 2 +- samples/combo/Makefile.in | 2 +- samples/config/Makefile.in | 2 +- samples/dataview/Makefile.in | 2 +- samples/debugrpt/Makefile.in | 2 +- samples/dialogs/Makefile.in | 8 +++--- samples/dialup/Makefile.in | 2 +- samples/display/Makefile.in | 2 +- samples/dll/Makefile.in | 2 +- samples/dnd/Makefile.in | 2 +- samples/docview/Info.plist | 8 +++--- samples/docview/Makefile.in | 2 +- samples/dragimag/Makefile.in | 2 +- samples/drawing/Makefile.in | 2 +- samples/erase/Makefile.in | 2 +- samples/event/Makefile.in | 2 +- samples/except/Makefile.in | 2 +- samples/exec/Makefile.in | 2 +- samples/font/Makefile.in | 2 +- samples/fswatcher/Makefile.in | 2 +- samples/grid/Makefile.in | 2 +- samples/help/Makefile.in | 2 +- samples/htlbox/Makefile.in | 2 +- samples/html/about/Makefile.in | 2 +- samples/html/help/Makefile.in | 2 +- samples/html/helpview/Makefile.in | 2 +- samples/html/htmlctrl/Makefile.in | 2 +- samples/html/printing/Makefile.in | 2 +- samples/html/test/Makefile.in | 2 +- samples/html/virtual/Makefile.in | 2 +- samples/html/widget/Makefile.in | 2 +- samples/html/zip/Makefile.in | 2 +- samples/image/Makefile.in | 2 +- samples/internat/Makefile.in | 2 +- samples/ipc/Makefile.in | 2 +- samples/joytest/Makefile.in | 2 +- samples/keyboard/Makefile.in | 2 +- samples/layout/Makefile.in | 2 +- samples/listctrl/Makefile.in | 2 +- samples/mdi/Makefile.in | 2 +- samples/mediaplayer/Makefile.in | 2 +- samples/memcheck/Makefile.in | 2 +- samples/menu/Makefile.in | 2 +- samples/minimal/Info_cocoa.plist | 8 +++--- samples/minimal/Makefile.in | 2 +- samples/nativdlg/Makefile.in | 2 +- samples/notebook/Makefile.in | 2 +- samples/oleauto/Makefile.in | 2 +- samples/opengl/cube/Makefile.in | 2 +- samples/opengl/isosurf/Makefile.in | 2 +- samples/opengl/penguin/Makefile.in | 2 +- samples/opengl/pyramid/Makefile.in | 2 +- samples/ownerdrw/Makefile.in | 2 +- samples/popup/Makefile.in | 2 +- samples/power/Makefile.in | 2 +- samples/preferences/Makefile.in | 2 +- samples/printing/Makefile.in | 2 +- samples/propgrid/Makefile.in | 2 +- samples/regtest/Makefile.in | 2 +- samples/render/Makefile.in | 4 +-- samples/render/makefile.bcc | 2 +- samples/render/makefile.gcc | 2 +- samples/render/makefile.vc | 2 +- samples/render/render_vc7_renddll.vcproj | 12 ++++----- samples/render/render_vc8_renddll.vcproj | 24 +++++++++--------- samples/render/render_vc9_renddll.vcproj | 24 +++++++++--------- samples/ribbon/Makefile.in | 2 +- samples/richtext/Makefile.in | 2 +- samples/sashtest/Makefile.in | 2 +- samples/scroll/Makefile.in | 2 +- samples/shaped/Makefile.in | 2 +- samples/sockets/Makefile.in | 2 +- samples/sound/Makefile.in | 2 +- samples/splash/Makefile.in | 2 +- samples/splitter/Makefile.in | 2 +- samples/statbar/Makefile.in | 2 +- samples/stc/Makefile.in | 2 +- samples/svg/Makefile.in | 2 +- samples/taborder/Makefile.in | 2 +- samples/taskbar/Makefile.in | 2 +- samples/taskbarbutton/Makefile.in | 2 +- samples/text/Makefile.in | 2 +- samples/thread/Makefile.in | 2 +- samples/toolbar/Makefile.in | 2 +- samples/treectrl/Makefile.in | 2 +- samples/treelist/Makefile.in | 2 +- samples/typetest/Makefile.in | 2 +- samples/uiaction/Makefile.in | 2 +- samples/validate/Makefile.in | 2 +- samples/vscroll/Makefile.in | 2 +- samples/webview/Makefile.in | 2 +- samples/widgets/Makefile.in | 2 +- samples/wizard/Makefile.in | 2 +- samples/wrapsizer/Makefile.in | 2 +- samples/xrc/Makefile.in | 2 +- samples/xti/Makefile.in | 2 +- tests/Makefile.in | 2 +- tests/benchmarks/Makefile.in | 2 +- utils/helpview/src/Makefile.in | 2 +- utils/screenshotgen/src/Makefile.in | 2 +- 174 files changed, 828 insertions(+), 828 deletions(-) diff --git a/Makefile.in b/Makefile.in index e44bc57695..59f1e05acc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -74,8 +74,8 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 WX_RELEASE_NODOT = 31 -WX_VERSION = $(WX_RELEASE).2 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2 +WX_VERSION = $(WX_RELEASE).3 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 LIBDIRNAME = $(wx_top_builddir)/lib WXREGEX_CFLAGS = -DNDEBUG -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \ $(CPPFLAGS) $(CFLAGS) @@ -13678,17 +13678,17 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \ @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_65 = --define wxNO_EXCEPTIONS @COND_USE_RTTI_0@__RTTI_DEFINE_p_65 = --define wxNO_RTTI @COND_USE_THREADS_0@__THREAD_DEFINE_p_65 = --define wxNO_THREADS -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).2 -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .2.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).3 +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .3.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX) @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@dll___targetsuf3 \ @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ = \ -@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).2.0.0 +@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).3.0.0 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \ -@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .2.0.0.$(SO_SUFFIX) -@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -2.$(SO_SUFFIX) +@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .3.0.0.$(SO_SUFFIX) +@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -3.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX) -@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).2 +@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).3 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_66 \ diff --git a/build/bakefiles/version.bkl b/build/bakefiles/version.bkl index 83efd1778b..87384325c7 100644 --- a/build/bakefiles/version.bkl +++ b/build/bakefiles/version.bkl @@ -22,7 +22,7 @@ 3. Else, i.e. if there were no changes at all to API but only internal changes, change C:R:A to C:R+1:A --> - 2 + 3 0 0 diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 8112f30f89..61a863bb2b 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -38,7 +38,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \ -DCFG="$(CFG)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" WX_RELEASE_NODOT = 31 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 COMPILER_PREFIX = bcc OBJS = \ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -5563,7 +5563,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index c6a2042c6b..792e88f599 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -32,7 +32,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ WINDRES="$(WINDRES)" CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 31 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 COMPILER_PREFIX = gcc OBJS = \ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) @@ -5745,7 +5745,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index c1ce7f10bd..6b918dd50d 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -29,7 +29,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ RUNTIME_LIBS="$(RUNTIME_LIBS)" WX_RELEASE_NODOT = 31 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 COMPILER_PREFIX = vc OBJS = \ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) @@ -6272,7 +6272,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs build_cfg_file: $(SETUPHDIR) @echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE) @echo WXVER_MINOR=1 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=2 >>$(BUILD_CFG_FILE) + @echo WXVER_RELEASE=3 >>$(BUILD_CFG_FILE) @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) diff --git a/build/msw/wx_setup.props b/build/msw/wx_setup.props index 2933d0052c..facf4a7e5b 100644 --- a/build/msw/wx_setup.props +++ b/build/msw/wx_setup.props @@ -1,7 +1,7 @@  - 312 + 313 31 msw vc diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj index f1b0fa89cb..1a37048247 100644 --- a/build/msw/wx_vc7_adv.vcproj +++ b/build/msw/wx_vc7_adv.vcproj @@ -156,7 +156,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch" ObjectFile="vc_mswuddll\adv\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_adv_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -167,13 +167,13 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_adv_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_adv.lib" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_adv_vc_custom.pdb" TargetMachine="1"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,7 +254,7 @@ Name="VCPreLinkEventTool"/> @@ -254,14 +254,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_adv_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_adv.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_adv_vc_custom.pdb" TargetMachine="1" /> @@ -345,14 +345,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_adv_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_adv.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_adv_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_advdll.pch" ObjectFile="vc_mswuddll_x64\adv\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_adv_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_adv_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -597,7 +597,7 @@ /> @@ -608,14 +608,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_adv_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_adv_vc_custom.pdb" TargetMachine="17" /> @@ -699,14 +699,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_adv_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_adv.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_adv_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_aui.vcproj b/build/msw/wx_vc8_aui.vcproj index d0fb853e97..be68250504 100644 --- a/build/msw/wx_vc8_aui.vcproj +++ b/build/msw/wx_vc8_aui.vcproj @@ -232,7 +232,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_auidll.pch" ObjectFile="vc_mswuddll\aui\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_aui_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -243,7 +243,7 @@ /> @@ -254,14 +254,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_aui_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_aui.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_aui_vc_custom.pdb" TargetMachine="1" /> @@ -345,14 +345,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_aui_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_aui.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_aui_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_auidll.pch" ObjectFile="vc_mswuddll_x64\aui\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_aui_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_aui_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -597,7 +597,7 @@ /> @@ -608,14 +608,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_aui_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_aui.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_aui_vc_custom.pdb" TargetMachine="17" /> @@ -699,14 +699,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_aui_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_aui.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_aui_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj index cf9f52adfe..2ed24c6293 100644 --- a/build/msw/wx_vc8_base.vcproj +++ b/build/msw/wx_vc8_base.vcproj @@ -232,7 +232,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch" ObjectFile="vc_mswuddll\base\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313ud_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -243,7 +243,7 @@ /> @@ -254,14 +254,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" - OutputFile="..\..\lib\vc_dll\wxbase312ud_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase313ud_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxbase31ud.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313ud_vc_custom.pdb" TargetMachine="1" /> @@ -345,14 +345,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" - OutputFile="..\..\lib\vc_dll\wxbase312u_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase313u_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxbase31u.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313u_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_basedll.pch" ObjectFile="vc_mswuddll_x64\base\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312ud_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase313ud_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -597,7 +597,7 @@ /> @@ -608,14 +608,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase312ud_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase313ud_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312ud_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313ud_vc_custom.pdb" TargetMachine="17" /> @@ -699,14 +699,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase312u_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase313u_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312u_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313u_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj index b734aa02bd..701ec8da4e 100644 --- a/build/msw/wx_vc8_core.vcproj +++ b/build/msw/wx_vc8_core.vcproj @@ -232,7 +232,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch" ObjectFile="vc_mswuddll\core\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_core_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -243,7 +243,7 @@ /> @@ -254,14 +254,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_core_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_core.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_core_vc_custom.pdb" TargetMachine="1" /> @@ -345,14 +345,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_core_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_core_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_core.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_core_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_coredll.pch" ObjectFile="vc_mswuddll_x64\core\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_core_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_core_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -597,7 +597,7 @@ /> @@ -608,14 +608,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_core_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_core_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_core.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_core_vc_custom.pdb" TargetMachine="17" /> @@ -699,14 +699,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_core_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_core_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_core.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_core_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_gl.vcproj b/build/msw/wx_vc8_gl.vcproj index aafbc68c01..59b6fceec4 100644 --- a/build/msw/wx_vc8_gl.vcproj +++ b/build/msw/wx_vc8_gl.vcproj @@ -232,7 +232,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_gldll.pch" ObjectFile="vc_mswuddll\gl\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_gl_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -243,7 +243,7 @@ /> @@ -254,14 +254,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_gl_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_gl.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_gl_vc_custom.pdb" TargetMachine="1" /> @@ -345,14 +345,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_gl_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_gl.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_gl_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_gldll.pch" ObjectFile="vc_mswuddll_x64\gl\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_gl_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_gl_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -597,7 +597,7 @@ /> @@ -608,14 +608,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_gl_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_gl.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_gl_vc_custom.pdb" TargetMachine="17" /> @@ -699,14 +699,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_gl_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_gl.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_gl_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_html.vcproj b/build/msw/wx_vc8_html.vcproj index 917a7418d9..9d4b4e4695 100644 --- a/build/msw/wx_vc8_html.vcproj +++ b/build/msw/wx_vc8_html.vcproj @@ -232,7 +232,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch" ObjectFile="vc_mswuddll\html\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_html_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -243,7 +243,7 @@ /> @@ -254,14 +254,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_html_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_html.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_html_vc_custom.pdb" TargetMachine="1" /> @@ -345,14 +345,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_html_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_html_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_html.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_html_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_htmldll.pch" ObjectFile="vc_mswuddll_x64\html\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_html_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_html_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -597,7 +597,7 @@ /> @@ -608,14 +608,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_html_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_html_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_html.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_html_vc_custom.pdb" TargetMachine="17" /> @@ -699,14 +699,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_html_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_html_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_html.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_html_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_media.vcproj b/build/msw/wx_vc8_media.vcproj index 06eebf66ce..d65e76f754 100644 --- a/build/msw/wx_vc8_media.vcproj +++ b/build/msw/wx_vc8_media.vcproj @@ -232,7 +232,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_mediadll.pch" ObjectFile="vc_mswuddll\media\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_media_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -243,7 +243,7 @@ /> @@ -254,14 +254,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_media_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_media.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_media_vc_custom.pdb" TargetMachine="1" /> @@ -345,14 +345,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_media_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_media_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_media.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_media_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_mediadll.pch" ObjectFile="vc_mswuddll_x64\media\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_media_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_media_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -597,7 +597,7 @@ /> @@ -608,14 +608,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_media_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_media_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_media.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_media_vc_custom.pdb" TargetMachine="17" /> @@ -699,14 +699,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_media_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_media_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_media.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_media_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_net.vcproj b/build/msw/wx_vc8_net.vcproj index 31bf4accd3..1ceb1e9bf1 100644 --- a/build/msw/wx_vc8_net.vcproj +++ b/build/msw/wx_vc8_net.vcproj @@ -232,7 +232,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_netdll.pch" ObjectFile="vc_mswuddll\net\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313ud_net_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -243,7 +243,7 @@ /> @@ -254,14 +254,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase313ud_net_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxbase31ud_net.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313ud_net_vc_custom.pdb" TargetMachine="1" /> @@ -345,14 +345,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxbase312u_net_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase313u_net_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxbase31u_net.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313u_net_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_netdll.pch" ObjectFile="vc_mswuddll_x64\net\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312ud_net_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase313ud_net_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -597,7 +597,7 @@ /> @@ -608,14 +608,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase312ud_net_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase313ud_net_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud_net.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312ud_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313ud_net_vc_custom.pdb" TargetMachine="17" /> @@ -699,14 +699,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase312u_net_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase313u_net_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u_net.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312u_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313u_net_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_propgrid.vcproj b/build/msw/wx_vc8_propgrid.vcproj index e91f29b651..25d48e09d0 100644 --- a/build/msw/wx_vc8_propgrid.vcproj +++ b/build/msw/wx_vc8_propgrid.vcproj @@ -232,7 +232,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_propgriddll.pch" ObjectFile="vc_mswuddll\propgrid\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_propgrid_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -243,7 +243,7 @@ /> @@ -254,14 +254,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_propgrid_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_propgrid.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_propgrid_vc_custom.pdb" TargetMachine="1" /> @@ -345,14 +345,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_propgrid_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_propgrid.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_propgrid_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_propgriddll.pch" ObjectFile="vc_mswuddll_x64\propgrid\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_propgrid_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_propgrid_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -597,7 +597,7 @@ /> @@ -608,14 +608,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_propgrid_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_propgrid.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_propgrid_vc_custom.pdb" TargetMachine="17" /> @@ -699,14 +699,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_propgrid_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_propgrid.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_propgrid_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_qa.vcproj b/build/msw/wx_vc8_qa.vcproj index 527643dd00..e181e0b8b5 100644 --- a/build/msw/wx_vc8_qa.vcproj +++ b/build/msw/wx_vc8_qa.vcproj @@ -232,7 +232,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_qadll.pch" ObjectFile="vc_mswuddll\qa\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_qa_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -243,7 +243,7 @@ /> @@ -254,14 +254,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_qa_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_qa.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_qa_vc_custom.pdb" TargetMachine="1" /> @@ -345,14 +345,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib ..\..\lib\vc_dll\wxbase31u_xml.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_qa_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_qa.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_qa_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_qadll.pch" ObjectFile="vc_mswuddll_x64\qa\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_qa_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_qa_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -597,7 +597,7 @@ /> @@ -608,14 +608,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_qa_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_qa.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_qa_vc_custom.pdb" TargetMachine="17" /> @@ -699,14 +699,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_qa_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_qa.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_qa_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_ribbon.vcproj b/build/msw/wx_vc8_ribbon.vcproj index c981557dfa..d1738d08e7 100644 --- a/build/msw/wx_vc8_ribbon.vcproj +++ b/build/msw/wx_vc8_ribbon.vcproj @@ -232,7 +232,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch" ObjectFile="vc_mswuddll\ribbon\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_ribbon_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -243,7 +243,7 @@ /> @@ -254,14 +254,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_ribbon_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_ribbon.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_ribbon_vc_custom.pdb" TargetMachine="1" /> @@ -345,14 +345,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_ribbon_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_ribbon.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_ribbon_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_ribbondll.pch" ObjectFile="vc_mswuddll_x64\ribbon\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_ribbon_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_ribbon_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -597,7 +597,7 @@ /> @@ -608,14 +608,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_ribbon_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_ribbon.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_ribbon_vc_custom.pdb" TargetMachine="17" /> @@ -699,14 +699,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_ribbon_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_ribbon.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_ribbon_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_richtext.vcproj b/build/msw/wx_vc8_richtext.vcproj index d7de7993dc..2417569b21 100644 --- a/build/msw/wx_vc8_richtext.vcproj +++ b/build/msw/wx_vc8_richtext.vcproj @@ -232,7 +232,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_richtextdll.pch" ObjectFile="vc_mswuddll\richtext\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_richtext_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -243,7 +243,7 @@ /> @@ -254,14 +254,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_richtext_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_richtext.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_richtext_vc_custom.pdb" TargetMachine="1" /> @@ -345,14 +345,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_richtext_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_richtext.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_richtext_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_richtextdll.pch" ObjectFile="vc_mswuddll_x64\richtext\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_richtext_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_richtext_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -597,7 +597,7 @@ /> @@ -608,14 +608,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_richtext_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_richtext.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_richtext_vc_custom.pdb" TargetMachine="17" /> @@ -699,14 +699,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_richtext_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_richtext.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_richtext_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_stc.vcproj b/build/msw/wx_vc8_stc.vcproj index 45fdaee256..31b10dfd63 100644 --- a/build/msw/wx_vc8_stc.vcproj +++ b/build/msw/wx_vc8_stc.vcproj @@ -232,7 +232,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_stcdll.pch" ObjectFile="vc_mswuddll\stc\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_stc_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -243,7 +243,7 @@ /> @@ -254,14 +254,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_stc_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_stc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_stc_vc_custom.pdb" TargetMachine="1" /> @@ -345,14 +345,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_stc_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_stc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_stc_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_stcdll.pch" ObjectFile="vc_mswuddll_x64\stc\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_stc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_stc_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -597,7 +597,7 @@ /> @@ -608,14 +608,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxscintillad.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_stc_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_stc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_stc_vc_custom.pdb" TargetMachine="17" /> @@ -699,14 +699,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxscintilla.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_stc_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_stc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_stc_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_webview.vcproj b/build/msw/wx_vc8_webview.vcproj index 6e191c3c4c..05673768c1 100644 --- a/build/msw/wx_vc8_webview.vcproj +++ b/build/msw/wx_vc8_webview.vcproj @@ -232,7 +232,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_webviewdll.pch" ObjectFile="vc_mswuddll\webview\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_webview_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -243,7 +243,7 @@ /> @@ -254,14 +254,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_webview_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_webview.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_webview_vc_custom.pdb" TargetMachine="1" /> @@ -345,14 +345,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_webview_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_webview_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_webview.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_webview_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_webview_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_webviewdll.pch" ObjectFile="vc_mswuddll_x64\webview\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_webview_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_webview_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -597,7 +597,7 @@ /> @@ -608,14 +608,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_webview_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_webview_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_webview.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_webview_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_webview_vc_custom.pdb" TargetMachine="17" /> @@ -699,14 +699,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_webview_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_webview_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_webview.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_webview_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_webview_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_xml.vcproj b/build/msw/wx_vc8_xml.vcproj index bc8f471460..9a8b394661 100644 --- a/build/msw/wx_vc8_xml.vcproj +++ b/build/msw/wx_vc8_xml.vcproj @@ -232,7 +232,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_xmldll.pch" ObjectFile="vc_mswuddll\xml\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313ud_xml_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -243,7 +243,7 @@ /> @@ -254,14 +254,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase313ud_xml_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxbase31ud_xml.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313ud_xml_vc_custom.pdb" TargetMachine="1" /> @@ -345,14 +345,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxbase312u_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase313u_xml_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxbase31u_xml.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313u_xml_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_xmldll.pch" ObjectFile="vc_mswuddll_x64\xml\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312ud_xml_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase313ud_xml_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -597,7 +597,7 @@ /> @@ -608,14 +608,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase312ud_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase313ud_xml_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud_xml.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312ud_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313ud_xml_vc_custom.pdb" TargetMachine="17" /> @@ -699,14 +699,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase312u_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase313u_xml_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u_xml.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312u_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313u_xml_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc8_xrc.vcproj b/build/msw/wx_vc8_xrc.vcproj index 763263fdf9..2c1facc1d1 100644 --- a/build/msw/wx_vc8_xrc.vcproj +++ b/build/msw/wx_vc8_xrc.vcproj @@ -232,7 +232,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_xrcdll.pch" ObjectFile="vc_mswuddll\xrc\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_xrc_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -243,7 +243,7 @@ /> @@ -254,14 +254,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_xrc_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_xrc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_xrc_vc_custom.pdb" TargetMachine="1" /> @@ -345,14 +345,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_xrc_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_xrc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_xrc_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -586,7 +586,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_xrcdll.pch" ObjectFile="vc_mswuddll_x64\xrc\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_xrc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_xrc_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -597,7 +597,7 @@ /> @@ -608,14 +608,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_xrc_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_xrc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_xrc_vc_custom.pdb" TargetMachine="17" /> @@ -699,14 +699,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_xrc_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_xrc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_xrc_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_adv.vcproj b/build/msw/wx_vc9_adv.vcproj index e557c01b33..9383d38179 100644 --- a/build/msw/wx_vc9_adv.vcproj +++ b/build/msw/wx_vc9_adv.vcproj @@ -231,7 +231,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_advdll.pch" ObjectFile="vc_mswuddll\adv\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_adv_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -241,7 +241,7 @@ /> @@ -252,14 +252,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_adv_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_adv.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_adv_vc_custom.pdb" TargetMachine="1" /> @@ -343,14 +343,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_adv_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_adv.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_adv_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_advdll.pch" ObjectFile="vc_mswuddll_x64\adv\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_adv_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_adv_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -593,7 +593,7 @@ /> @@ -604,14 +604,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_adv_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_adv.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_adv_vc_custom.pdb" TargetMachine="17" /> @@ -695,14 +695,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_adv_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_adv_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_adv.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_adv_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_adv_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_aui.vcproj b/build/msw/wx_vc9_aui.vcproj index 5fce5618fb..52ddd2d228 100644 --- a/build/msw/wx_vc9_aui.vcproj +++ b/build/msw/wx_vc9_aui.vcproj @@ -231,7 +231,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_auidll.pch" ObjectFile="vc_mswuddll\aui\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_aui_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -241,7 +241,7 @@ /> @@ -252,14 +252,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_aui_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_aui.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_aui_vc_custom.pdb" TargetMachine="1" /> @@ -343,14 +343,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_aui_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_aui.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_aui_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_auidll.pch" ObjectFile="vc_mswuddll_x64\aui\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_aui_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_aui_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -593,7 +593,7 @@ /> @@ -604,14 +604,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_aui_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_aui.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_aui_vc_custom.pdb" TargetMachine="17" /> @@ -695,14 +695,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_aui_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_aui_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_aui.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_aui_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_aui_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_base.vcproj b/build/msw/wx_vc9_base.vcproj index 747fc6838a..c2ff20dcde 100644 --- a/build/msw/wx_vc9_base.vcproj +++ b/build/msw/wx_vc9_base.vcproj @@ -231,7 +231,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_basedll.pch" ObjectFile="vc_mswuddll\base\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313ud_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -241,7 +241,7 @@ /> @@ -252,14 +252,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" - OutputFile="..\..\lib\vc_dll\wxbase312ud_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase313ud_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxbase31ud.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313ud_vc_custom.pdb" TargetMachine="1" /> @@ -343,14 +343,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" - OutputFile="..\..\lib\vc_dll\wxbase312u_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase313u_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxbase31u.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313u_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_basedll.pch" ObjectFile="vc_mswuddll_x64\base\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312ud_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase313ud_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -593,7 +593,7 @@ /> @@ -604,14 +604,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase312ud_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase313ud_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312ud_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313ud_vc_custom.pdb" TargetMachine="17" /> @@ -695,14 +695,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase312u_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase313u_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312u_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313u_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index 0b33c64c19..c235625f90 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -231,7 +231,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_coredll.pch" ObjectFile="vc_mswuddll\core\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_core_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -241,7 +241,7 @@ /> @@ -252,14 +252,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_core_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_core.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_core_vc_custom.pdb" TargetMachine="1" /> @@ -343,14 +343,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_core_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_core_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_core.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_core_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_coredll.pch" ObjectFile="vc_mswuddll_x64\core\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_core_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_core_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -593,7 +593,7 @@ /> @@ -604,14 +604,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_core_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_core_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_core.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_core_vc_custom.pdb" TargetMachine="17" /> @@ -695,14 +695,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_core_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_core_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_core.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_core_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_core_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_gl.vcproj b/build/msw/wx_vc9_gl.vcproj index 0e1953cda8..24a60e620f 100644 --- a/build/msw/wx_vc9_gl.vcproj +++ b/build/msw/wx_vc9_gl.vcproj @@ -231,7 +231,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_gldll.pch" ObjectFile="vc_mswuddll\gl\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_gl_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -241,7 +241,7 @@ /> @@ -252,14 +252,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_gl_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_gl.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_gl_vc_custom.pdb" TargetMachine="1" /> @@ -343,14 +343,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_gl_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_gl.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_gl_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_gldll.pch" ObjectFile="vc_mswuddll_x64\gl\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_gl_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_gl_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -593,7 +593,7 @@ /> @@ -604,14 +604,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31ud_core.lib wxbase31ud.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_gl_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_gl.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_gl_vc_custom.pdb" TargetMachine="17" /> @@ -695,14 +695,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib wxmsw31u_core.lib wxbase31u.lib opengl32.lib glu32.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_gl_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_gl_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_gl.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_gl_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_gl_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_html.vcproj b/build/msw/wx_vc9_html.vcproj index f7db5c0beb..ec95e4ddfd 100644 --- a/build/msw/wx_vc9_html.vcproj +++ b/build/msw/wx_vc9_html.vcproj @@ -231,7 +231,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_htmldll.pch" ObjectFile="vc_mswuddll\html\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_html_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -241,7 +241,7 @@ /> @@ -252,14 +252,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_html_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_html.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_html_vc_custom.pdb" TargetMachine="1" /> @@ -343,14 +343,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_html_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_html_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_html.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_html_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_htmldll.pch" ObjectFile="vc_mswuddll_x64\html\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_html_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_html_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -593,7 +593,7 @@ /> @@ -604,14 +604,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_html_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_html_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_html.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_html_vc_custom.pdb" TargetMachine="17" /> @@ -695,14 +695,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_html_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_html_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_html.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_html_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_html_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_media.vcproj b/build/msw/wx_vc9_media.vcproj index b8424ebec1..d67bbb15b3 100644 --- a/build/msw/wx_vc9_media.vcproj +++ b/build/msw/wx_vc9_media.vcproj @@ -231,7 +231,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_mediadll.pch" ObjectFile="vc_mswuddll\media\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_media_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -241,7 +241,7 @@ /> @@ -252,14 +252,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_media_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_media.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_media_vc_custom.pdb" TargetMachine="1" /> @@ -343,14 +343,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_media_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_media_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_media.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_media_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_mediadll.pch" ObjectFile="vc_mswuddll_x64\media\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_media_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_media_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -593,7 +593,7 @@ /> @@ -604,14 +604,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_media_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_media_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_media.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_media_vc_custom.pdb" TargetMachine="17" /> @@ -695,14 +695,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_media_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_media_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_media.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_media_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_media_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_net.vcproj b/build/msw/wx_vc9_net.vcproj index f23b6ad85f..a9a35efbd9 100644 --- a/build/msw/wx_vc9_net.vcproj +++ b/build/msw/wx_vc9_net.vcproj @@ -231,7 +231,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_netdll.pch" ObjectFile="vc_mswuddll\net\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313ud_net_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -241,7 +241,7 @@ /> @@ -252,14 +252,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase313ud_net_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxbase31ud_net.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313ud_net_vc_custom.pdb" TargetMachine="1" /> @@ -343,14 +343,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxbase312u_net_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase313u_net_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxbase31u_net.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313u_net_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_netdll.pch" ObjectFile="vc_mswuddll_x64\net\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312ud_net_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase313ud_net_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -593,7 +593,7 @@ /> @@ -604,14 +604,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase312ud_net_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase313ud_net_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud_net.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312ud_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313ud_net_vc_custom.pdb" TargetMachine="17" /> @@ -695,14 +695,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase312u_net_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase313u_net_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u_net.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312u_net_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313u_net_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_propgrid.vcproj b/build/msw/wx_vc9_propgrid.vcproj index ac9cf34856..6e666de470 100644 --- a/build/msw/wx_vc9_propgrid.vcproj +++ b/build/msw/wx_vc9_propgrid.vcproj @@ -231,7 +231,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_propgriddll.pch" ObjectFile="vc_mswuddll\propgrid\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_propgrid_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -241,7 +241,7 @@ /> @@ -252,14 +252,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_propgrid_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_propgrid.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_propgrid_vc_custom.pdb" TargetMachine="1" /> @@ -343,14 +343,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_propgrid_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_propgrid.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_propgrid_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_propgriddll.pch" ObjectFile="vc_mswuddll_x64\propgrid\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_propgrid_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_propgrid_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -593,7 +593,7 @@ /> @@ -604,14 +604,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_propgrid_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_propgrid.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_propgrid_vc_custom.pdb" TargetMachine="17" /> @@ -695,14 +695,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_propgrid_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_propgrid_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_propgrid.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_propgrid_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_propgrid_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_qa.vcproj b/build/msw/wx_vc9_qa.vcproj index e2b61a555c..ed0d965686 100644 --- a/build/msw/wx_vc9_qa.vcproj +++ b/build/msw/wx_vc9_qa.vcproj @@ -231,7 +231,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_qadll.pch" ObjectFile="vc_mswuddll\qa\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_qa_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -241,7 +241,7 @@ /> @@ -252,14 +252,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_qa_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_qa.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_qa_vc_custom.pdb" TargetMachine="1" /> @@ -343,14 +343,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib ..\..\lib\vc_dll\wxbase31u_xml.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_qa_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_qa.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_qa_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_qadll.pch" ObjectFile="vc_mswuddll_x64\qa\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_qa_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_qa_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -593,7 +593,7 @@ /> @@ -604,14 +604,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_qa_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_qa.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_qa_vc_custom.pdb" TargetMachine="17" /> @@ -695,14 +695,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_qa_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_qa_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_qa.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_qa_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_qa_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_ribbon.vcproj b/build/msw/wx_vc9_ribbon.vcproj index 80048af5bd..b25892a82f 100644 --- a/build/msw/wx_vc9_ribbon.vcproj +++ b/build/msw/wx_vc9_ribbon.vcproj @@ -231,7 +231,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_ribbondll.pch" ObjectFile="vc_mswuddll\ribbon\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_ribbon_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -241,7 +241,7 @@ /> @@ -252,14 +252,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_ribbon_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_ribbon.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_ribbon_vc_custom.pdb" TargetMachine="1" /> @@ -343,14 +343,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_ribbon_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_ribbon.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_ribbon_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_ribbondll.pch" ObjectFile="vc_mswuddll_x64\ribbon\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_ribbon_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_ribbon_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -593,7 +593,7 @@ /> @@ -604,14 +604,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_ribbon_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_ribbon.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_ribbon_vc_custom.pdb" TargetMachine="17" /> @@ -695,14 +695,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_ribbon_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_ribbon_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_ribbon.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_ribbon_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_ribbon_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_richtext.vcproj b/build/msw/wx_vc9_richtext.vcproj index ec1f74f5f5..1b53a5b687 100644 --- a/build/msw/wx_vc9_richtext.vcproj +++ b/build/msw/wx_vc9_richtext.vcproj @@ -231,7 +231,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_richtextdll.pch" ObjectFile="vc_mswuddll\richtext\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_richtext_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -241,7 +241,7 @@ /> @@ -252,14 +252,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_richtext_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_richtext.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_richtext_vc_custom.pdb" TargetMachine="1" /> @@ -343,14 +343,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_richtext_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_richtext.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_richtext_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_richtextdll.pch" ObjectFile="vc_mswuddll_x64\richtext\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_richtext_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_richtext_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -593,7 +593,7 @@ /> @@ -604,14 +604,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_richtext_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_richtext.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_richtext_vc_custom.pdb" TargetMachine="17" /> @@ -695,14 +695,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_richtext_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_richtext_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_richtext.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_richtext_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_richtext_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_stc.vcproj b/build/msw/wx_vc9_stc.vcproj index 085a10c834..e571c75370 100644 --- a/build/msw/wx_vc9_stc.vcproj +++ b/build/msw/wx_vc9_stc.vcproj @@ -231,7 +231,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_stcdll.pch" ObjectFile="vc_mswuddll\stc\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_stc_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -241,7 +241,7 @@ /> @@ -252,14 +252,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintillad.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_stc_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_stc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_stc_vc_custom.pdb" TargetMachine="1" /> @@ -343,14 +343,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxscintilla.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_stc_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_stc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_stc_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_stcdll.pch" ObjectFile="vc_mswuddll_x64\stc\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_stc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_stc_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -593,7 +593,7 @@ /> @@ -604,14 +604,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxscintillad.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_stc_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_stc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_stc_vc_custom.pdb" TargetMachine="17" /> @@ -695,14 +695,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxscintilla.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_stc_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_stc_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_stc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_stc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_stc_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_webview.vcproj b/build/msw/wx_vc9_webview.vcproj index 47754d8067..5f7ef0245e 100644 --- a/build/msw/wx_vc9_webview.vcproj +++ b/build/msw/wx_vc9_webview.vcproj @@ -231,7 +231,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_webviewdll.pch" ObjectFile="vc_mswuddll\webview\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_webview_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -241,7 +241,7 @@ /> @@ -252,14 +252,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_webview_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_webview.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_webview_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_webview_vc_custom.pdb" TargetMachine="1" /> @@ -343,14 +343,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_webview_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_webview_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_webview.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_webview_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_webview_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_webviewdll.pch" ObjectFile="vc_mswuddll_x64\webview\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_webview_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_webview_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -593,7 +593,7 @@ /> @@ -604,14 +604,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_webview_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_webview_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_webview.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_webview_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_webview_vc_custom.pdb" TargetMachine="17" /> @@ -695,14 +695,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_webview_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_webview_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_webview.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_webview_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_webview_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_xml.vcproj b/build/msw/wx_vc9_xml.vcproj index bd305d4c9b..9689c27f66 100644 --- a/build/msw/wx_vc9_xml.vcproj +++ b/build/msw/wx_vc9_xml.vcproj @@ -231,7 +231,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_xmldll.pch" ObjectFile="vc_mswuddll\xml\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxbase313ud_xml_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -241,7 +241,7 @@ /> @@ -252,14 +252,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase313ud_xml_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxbase31ud_xml.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312ud_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313ud_xml_vc_custom.pdb" TargetMachine="1" /> @@ -343,14 +343,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxbase312u_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxbase313u_xml_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxbase31u_xml.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxbase312u_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxbase313u_xml_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_xmldll.pch" ObjectFile="vc_mswuddll_x64\xml\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase312ud_xml_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxbase313ud_xml_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -593,7 +593,7 @@ /> @@ -604,14 +604,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase312ud_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase313ud_xml_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxbase31ud_xml.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312ud_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313ud_xml_vc_custom.pdb" TargetMachine="17" /> @@ -695,14 +695,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxbase312u_xml_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxbase313u_xml_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxbase31u_xml.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase312u_xml_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxbase313u_xml_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/msw/wx_vc9_xrc.vcproj b/build/msw/wx_vc9_xrc.vcproj index fe14540933..80e1a0f154 100644 --- a/build/msw/wx_vc9_xrc.vcproj +++ b/build/msw/wx_vc9_xrc.vcproj @@ -231,7 +231,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll\wxprec_xrcdll.pch" ObjectFile="vc_mswuddll\xrc\" - ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_dll\wxmsw313ud_xrc_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -241,7 +241,7 @@ /> @@ -252,14 +252,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31ud_html.lib ..\..\lib\vc_dll\wxmsw31ud_core.lib ..\..\lib\vc_dll\wxbase31ud_xml.lib ..\..\lib\vc_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313ud_xrc_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_dll\wxmsw31ud_xrc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312ud_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313ud_xrc_vc_custom.pdb" TargetMachine="1" /> @@ -343,14 +343,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxmsw31u_html.lib ..\..\lib\vc_dll\wxmsw31u_core.lib ..\..\lib\vc_dll\wxbase31u_xml.lib ..\..\lib\vc_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_dll\wxmsw313u_xrc_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_dll\wxmsw31u_xrc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw312u_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_dll\wxmsw313u_xrc_vc_custom.pdb" TargetMachine="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -583,7 +583,7 @@ PrecompiledHeaderThrough="wx/wxprec.h" PrecompiledHeaderFile="vc_mswuddll_x64\wxprec_xrcdll.pch" ObjectFile="vc_mswuddll_x64\xrc\" - ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw312ud_xrc_vc_custom.pdb" + ProgramDataBaseFileName="..\..\lib\vc_x64_dll\wxmsw313ud_xrc_vc_custom.pdb" WarningLevel="4" SuppressStartupBanner="true" DebugInformationFormat="3" @@ -593,7 +593,7 @@ /> @@ -604,14 +604,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31ud_html.lib ..\..\lib\vc_x64_dll\wxmsw31ud_core.lib ..\..\lib\vc_x64_dll\wxbase31ud_xml.lib ..\..\lib\vc_x64_dll\wxbase31ud.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312ud_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313ud_xrc_vc_custom.dll" LinkIncremental="2" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31ud_xrc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312ud_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313ud_xrc_vc_custom.pdb" TargetMachine="17" /> @@ -695,14 +695,14 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib ..\..\lib\vc_x64_dll\wxmsw31u_html.lib ..\..\lib\vc_x64_dll\wxmsw31u_core.lib ..\..\lib\vc_x64_dll\wxbase31u_xml.lib ..\..\lib\vc_x64_dll\wxbase31u.lib" - OutputFile="..\..\lib\vc_x64_dll\wxmsw312u_xrc_vc_custom.dll" + OutputFile="..\..\lib\vc_x64_dll\wxmsw313u_xrc_vc_custom.dll" LinkIncremental="1" ImportLibrary="..\..\lib\vc_x64_dll\wxmsw31u_xrc.lib" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\lib\vc_x64_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw312u_xrc_vc_custom.pdb" + ProgramDatabaseFile="..\..\lib\vc_x64_dll\wxmsw313u_xrc_vc_custom.pdb" TargetMachine="17" OptimizeReferences="2" EnableCOMDATFolding="2" diff --git a/build/osx/wxvers.xcconfig b/build/osx/wxvers.xcconfig index 2e4f173d30..61f0b5bd12 100644 --- a/build/osx/wxvers.xcconfig +++ b/build/osx/wxvers.xcconfig @@ -1,4 +1,4 @@ // update this file with new version numbers DYLIB_COMPATIBILITY_VERSION = 3.1 -DYLIB_CURRENT_VERSION = 3.1.2 +DYLIB_CURRENT_VERSION = 3.1.3 diff --git a/build/tools/msvs/getversion.bat b/build/tools/msvs/getversion.bat index 181acd8582..00440b353f 100644 --- a/build/tools/msvs/getversion.bat +++ b/build/tools/msvs/getversion.bat @@ -1,3 +1,3 @@ set wxMAJOR_VERSION=3 set wxMINOR_VERSION=1 -set wxRELEASE_NUMBER=2 +set wxRELEASE_NUMBER=3 diff --git a/configure b/configure index 18146f9527..031ff5c97b 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for wxWidgets 3.1.2. +# Generated by GNU Autoconf 2.69 for wxWidgets 3.1.3. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='wxWidgets' PACKAGE_TARNAME='wxwidgets' -PACKAGE_VERSION='3.1.2' -PACKAGE_STRING='wxWidgets 3.1.2' +PACKAGE_VERSION='3.1.3' +PACKAGE_STRING='wxWidgets 3.1.3' PACKAGE_BUGREPORT='wx-dev@googlegroups.com' PACKAGE_URL='' @@ -1946,7 +1946,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wxWidgets 3.1.2 to adapt to many kinds of systems. +\`configure' configures wxWidgets 3.1.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2015,7 +2015,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wxWidgets 3.1.2:";; + short | recursive ) echo "Configuration of wxWidgets 3.1.3:";; esac cat <<\_ACEOF @@ -2480,7 +2480,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wxWidgets configure 3.1.2 +wxWidgets configure 3.1.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3297,7 +3297,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wxWidgets $as_me 3.1.2, which was +It was created by wxWidgets $as_me 3.1.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3760,7 +3760,7 @@ fi wx_major_version_number=3 wx_minor_version_number=1 -wx_release_number=2 +wx_release_number=3 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number @@ -42294,7 +42294,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wxWidgets $as_me 3.1.2, which was +This file was extended by wxWidgets $as_me 3.1.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -42360,7 +42360,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -wxWidgets config.status 3.1.2 +wxWidgets config.status 3.1.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 2c91781ff0..b2aadfa781 100644 --- a/configure.in +++ b/configure.in @@ -14,7 +14,7 @@ dnl --------------------------------------------------------------------------- dnl initialization dnl --------------------------------------------------------------------------- -AC_INIT([wxWidgets], [3.1.2], [wx-dev@googlegroups.com]) +AC_INIT([wxWidgets], [3.1.3], [wx-dev@googlegroups.com]) dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package AC_CONFIG_SRCDIR([wx-config.in]) @@ -40,7 +40,7 @@ dnl wx_release_number += 1 wx_major_version_number=3 wx_minor_version_number=1 -wx_release_number=2 +wx_release_number=3 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in index a319a1b999..d1e54782de 100644 --- a/demos/bombs/Makefile.in +++ b/demos/bombs/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib BOMBS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in index 69ad8f09fe..bf7d342a44 100644 --- a/demos/forty/Makefile.in +++ b/demos/forty/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib FORTY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in index 6d2b3b8c16..bb2d45c29b 100644 --- a/demos/fractal/Makefile.in +++ b/demos/fractal/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib FRACTAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in index c2e582b4d2..32e5797288 100644 --- a/demos/life/Makefile.in +++ b/demos/life/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib LIFE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in index 528d0b28b7..5fa3a16b37 100644 --- a/demos/poem/Makefile.in +++ b/demos/poem/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib WXPOEM_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile index e6e63965c5..3c7b5d26b1 100644 --- a/docs/doxygen/Doxyfile +++ b/docs/doxygen/Doxyfile @@ -6,7 +6,7 @@ DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = wxWidgets -PROJECT_NUMBER = 3.1.2 +PROJECT_NUMBER = 3.1.3 PROJECT_BRIEF = PROJECT_LOGO = logo.png OUTPUT_DIRECTORY = out diff --git a/docs/readme.txt b/docs/readme.txt index c84dcbb8cf..cd9746f178 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -1,4 +1,4 @@ -wxWidgets 3.1.2 Release Notes +wxWidgets 3.1.3 Release Notes ============================= Welcome to the latest development release of wxWidgets, a free and open source @@ -16,12 +16,12 @@ more about wxWidgets at: Documentation is available online at: -* https://docs.wxwidgets.org/3.1.2/ +* https://docs.wxwidgets.org/3.1.3/ wxWidgets sources and binaries for the selected platforms are available for download from: -* https://github.com/wxWidgets/wxWidgets/releases/tag/v3.1.2/ +* https://github.com/wxWidgets/wxWidgets/releases/tag/v3.1.3/ Changes since 3.1.1 @@ -53,7 +53,7 @@ Some of the other improvements: Please refer to the detailed change log for the full list of changes: -https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.2/docs/changes.txt +https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.3/docs/changes.txt Notice that this release is almost completely compatible with 3.1.1 at the API diff --git a/include/wx/osx/config_xcode.h b/include/wx/osx/config_xcode.h index 1a4946c0e1..ab61d65363 100644 --- a/include/wx/osx/config_xcode.h +++ b/include/wx/osx/config_xcode.h @@ -126,9 +126,9 @@ #define PACKAGE_BUGREPORT "wx-dev@googlegroups.com" #define PACKAGE_NAME "wxWidgets" -#define PACKAGE_STRING "wxWidgets 3.1.2" +#define PACKAGE_STRING "wxWidgets 3.1.3" #define PACKAGE_TARNAME "wxwidgets" -#define PACKAGE_VERSION "3.1.2" +#define PACKAGE_VERSION "3.1.3" // for regex #define WX_NO_REGEX_ADVANCED 1 diff --git a/include/wx/version.h b/include/wx/version.h index f977b5364b..cdb72af195 100644 --- a/include/wx/version.h +++ b/include/wx/version.h @@ -27,9 +27,9 @@ /* NB: this file is parsed by automatic tools so don't change its format! */ #define wxMAJOR_VERSION 3 #define wxMINOR_VERSION 1 -#define wxRELEASE_NUMBER 2 +#define wxRELEASE_NUMBER 3 #define wxSUBRELEASE_NUMBER 0 -#define wxVERSION_STRING wxT("wxWidgets 3.1.2") +#define wxVERSION_STRING wxT("wxWidgets 3.1.3") /* nothing to update below this line when updating the version */ /* ---------------------------------------------------------------------------- */ diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in index f571d79ef2..183006d277 100644 --- a/samples/access/Makefile.in +++ b/samples/access/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib ACCESSTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/animate/Makefile.in b/samples/animate/Makefile.in index 89535addaa..4dda2ce105 100644 --- a/samples/animate/Makefile.in +++ b/samples/animate/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib ANITEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in index c0872109c3..22ad1b48fb 100644 --- a/samples/artprov/Makefile.in +++ b/samples/artprov/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib ARTTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in index 707f37ac52..8e69ef8364 100644 --- a/samples/aui/Makefile.in +++ b/samples/aui/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib AUIDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in index 98aa08a38e..c3b1cf5db5 100644 --- a/samples/calendar/Makefile.in +++ b/samples/calendar/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib CALENDAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in index 0cde6e4fb8..b5bbac3cf6 100644 --- a/samples/caret/Makefile.in +++ b/samples/caret/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib CARET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/clipboard/Makefile.in b/samples/clipboard/Makefile.in index b19c7f9b16..3b2cbcfe38 100644 --- a/samples/clipboard/Makefile.in +++ b/samples/clipboard/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib CLIPBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/collpane/Makefile.in b/samples/collpane/Makefile.in index 3a87aef156..8eb9e4357a 100644 --- a/samples/collpane/Makefile.in +++ b/samples/collpane/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib COLLPANE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in index 977d7b21aa..60e251d7ae 100644 --- a/samples/combo/Makefile.in +++ b/samples/combo/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib COMBO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in index 3b613f8bcb..5a737e2f5c 100644 --- a/samples/config/Makefile.in +++ b/samples/config/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib CONFTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in index 7d9dfdb4fb..dddf56da70 100644 --- a/samples/dataview/Makefile.in +++ b/samples/dataview/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib DATAVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/debugrpt/Makefile.in b/samples/debugrpt/Makefile.in index 3fcda9313e..a09717f94e 100644 --- a/samples/debugrpt/Makefile.in +++ b/samples/debugrpt/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib DEBUGRPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in index f9e618bff3..5c29eb0ef2 100644 --- a/samples/dialogs/Makefile.in +++ b/samples/dialogs/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib DIALOGS_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ @@ -198,6 +198,9 @@ dialogs_sample_rc.o: $(srcdir)/../../samples/sample.rc dialogs_dialogs.o: $(srcdir)/dialogs.cpp $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/dialogs.cpp +dialogs_fontdlgg.o: $(srcdir)/../../src/generic/fontdlgg.cpp + $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/fontdlgg.cpp + @COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@dialogs_colrdlgg.o: $(srcdir)/../../src/generic/colrdlgg.cpp @COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@ $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/colrdlgg.cpp @@ -220,9 +223,6 @@ dialogs_dialogs.o: $(srcdir)/dialogs.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/filedlgg.cpp -@COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@dialogs_fontdlgg.o: $(srcdir)/../../src/generic/fontdlgg.cpp -@COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0@ $(CXXC) -c -o $@ $(DIALOGS_CXXFLAGS) $(srcdir)/../../src/generic/fontdlgg.cpp - # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in index 68bd936bf0..fe259471c4 100644 --- a/samples/dialup/Makefile.in +++ b/samples/dialup/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib NETTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in index bafb9800c7..919fa34ed0 100644 --- a/samples/display/Makefile.in +++ b/samples/display/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib DISPLAY_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/dll/Makefile.in b/samples/dll/Makefile.in index 5eec3e1e1a..67fa0f4189 100644 --- a/samples/dll/Makefile.in +++ b/samples/dll/Makefile.in @@ -47,7 +47,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib MY_DLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in index f1b6583b40..09eef17aa4 100644 --- a/samples/dnd/Makefile.in +++ b/samples/dnd/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib DND_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/docview/Info.plist b/samples/docview/Info.plist index e4e80b1619..ef98445d90 100644 --- a/samples/docview/Info.plist +++ b/samples/docview/Info.plist @@ -51,7 +51,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 3.1.2, (c) 2005-2018 wxWidgets + $(PRODUCT_NAME) version 3.1.3, (c) 2005-2018 wxWidgets CFBundleIconFile doc CFBundleIdentifier @@ -66,17 +66,17 @@ it CFBundleLongVersionString - 3.1.2, (c) 2005-2018 wxWidgets + 3.1.3, (c) 2005-2018 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType APPL CFBundleShortVersionString - 3.1.2 + 3.1.3 CFBundleSignature WXMA CFBundleVersion - 3.1.2 + 3.1.3 CSResourcesFileMapped LSRequiresCarbon diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in index 9c174054d5..ed013660c0 100644 --- a/samples/docview/Makefile.in +++ b/samples/docview/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib DOCVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in index cdcd5c3002..f5974b4ee3 100644 --- a/samples/dragimag/Makefile.in +++ b/samples/dragimag/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib DRAGIMAG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in index 12385f46ea..690ce31287 100644 --- a/samples/drawing/Makefile.in +++ b/samples/drawing/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib DRAWING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in index 8c04bfff92..60f1c79ee1 100644 --- a/samples/erase/Makefile.in +++ b/samples/erase/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib ERASE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in index c99d2b6932..ebef4ff7f5 100644 --- a/samples/event/Makefile.in +++ b/samples/event/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib EVENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in index 78abbfb69c..85a876d838 100644 --- a/samples/except/Makefile.in +++ b/samples/except/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib EXCEPT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in index 4e6222a271..302de8a82e 100644 --- a/samples/exec/Makefile.in +++ b/samples/exec/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib EXEC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in index eca4325ffd..24a137b536 100644 --- a/samples/font/Makefile.in +++ b/samples/font/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib FONT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/fswatcher/Makefile.in b/samples/fswatcher/Makefile.in index b88bf03ab5..878268a606 100644 --- a/samples/fswatcher/Makefile.in +++ b/samples/fswatcher/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib FSWATCHER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in index ba1ff71dc3..6b2f41c7e1 100644 --- a/samples/grid/Makefile.in +++ b/samples/grid/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib GRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in index f4fac29686..242dc27163 100644 --- a/samples/help/Makefile.in +++ b/samples/help/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in index fe33e17a97..75093b2b44 100644 --- a/samples/htlbox/Makefile.in +++ b/samples/htlbox/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib HTLBOX_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in index 28ab32229b..3da1940d53 100644 --- a/samples/html/about/Makefile.in +++ b/samples/html/about/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib ABOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in index e07831b562..244d179c71 100644 --- a/samples/html/help/Makefile.in +++ b/samples/html/help/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib HTMLHELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in index 33739f4716..fd71f74ae4 100644 --- a/samples/html/helpview/Makefile.in +++ b/samples/html/helpview/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib HELPVIEW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/html/htmlctrl/Makefile.in b/samples/html/htmlctrl/Makefile.in index 689aaf8eab..edd0c6f43a 100644 --- a/samples/html/htmlctrl/Makefile.in +++ b/samples/html/htmlctrl/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib HTMLCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in index 250602ff17..354273db3e 100644 --- a/samples/html/printing/Makefile.in +++ b/samples/html/printing/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib HTMLPRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in index 1b9c6052fa..a5723a79f2 100644 --- a/samples/html/test/Makefile.in +++ b/samples/html/test/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in index 211077ef89..faa9924287 100644 --- a/samples/html/virtual/Makefile.in +++ b/samples/html/virtual/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib VIRTUAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in index 39a71c056a..a2cb354287 100644 --- a/samples/html/widget/Makefile.in +++ b/samples/html/widget/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib WIDGET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in index 7ed0473a94..65f1a8ecf3 100644 --- a/samples/html/zip/Makefile.in +++ b/samples/html/zip/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib ZIP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in index e2c1229337..6a06bfc027 100644 --- a/samples/image/Makefile.in +++ b/samples/image/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib IMAGE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in index 3ef989d92d..c518bb8c60 100644 --- a/samples/internat/Makefile.in +++ b/samples/internat/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib INTERNAT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in index 92ea202001..1743cd69b6 100644 --- a/samples/ipc/Makefile.in +++ b/samples/ipc/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib IPCCLIENT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in index c8ac8839e9..2ed708d4fa 100644 --- a/samples/joytest/Makefile.in +++ b/samples/joytest/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib JOYTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in index 81699ecf03..bc66367950 100644 --- a/samples/keyboard/Makefile.in +++ b/samples/keyboard/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib KEYBOARD_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in index e5c429f7d5..647d032bf4 100644 --- a/samples/layout/Makefile.in +++ b/samples/layout/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib LAYOUT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in index eff840df3f..47db8a86df 100644 --- a/samples/listctrl/Makefile.in +++ b/samples/listctrl/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib LISTCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in index 43aaacff3c..5956c64ea4 100644 --- a/samples/mdi/Makefile.in +++ b/samples/mdi/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib MDI_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in index 66452d80b0..b17a1aa205 100644 --- a/samples/mediaplayer/Makefile.in +++ b/samples/mediaplayer/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib MEDIAPLAYER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/memcheck/Makefile.in b/samples/memcheck/Makefile.in index b8df990e07..fdc9eecbd1 100644 --- a/samples/memcheck/Makefile.in +++ b/samples/memcheck/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib MEMCHECK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in index 4c0b4ad669..3d0b33925e 100644 --- a/samples/menu/Makefile.in +++ b/samples/menu/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib MENU_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/minimal/Info_cocoa.plist b/samples/minimal/Info_cocoa.plist index 42d8369cb5..8b2b276be9 100644 --- a/samples/minimal/Info_cocoa.plist +++ b/samples/minimal/Info_cocoa.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(PRODUCT_NAME) CFBundleGetInfoString - $(PRODUCT_NAME) version 3.1.2, (c) 2005-2018 wxWidgets + $(PRODUCT_NAME) version 3.1.3, (c) 2005-2018 wxWidgets CFBundleIconFile wxmac.icns CFBundleIdentifier @@ -22,17 +22,17 @@ it CFBundleLongVersionString - 3.1.2, (c) 2005-2018 wxWidgets + 3.1.3, (c) 2005-2018 wxWidgets CFBundleName $(PRODUCT_NAME) CFBundlePackageType APPL CFBundleShortVersionString - 3.1.2 + 3.1.3 CFBundleSignature ???? CFBundleVersion - 3.1.2 + 3.1.3 NSHumanReadableCopyright Copyright 2005-2018 wxWidgets NSPrincipalClass diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in index 602f911640..9414fe380b 100644 --- a/samples/minimal/Makefile.in +++ b/samples/minimal/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib MINIMAL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in index c1fd94a974..9c10d003ae 100644 --- a/samples/nativdlg/Makefile.in +++ b/samples/nativdlg/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib NATIVDLG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in index 786a2d9335..18f5e8eb6b 100644 --- a/samples/notebook/Makefile.in +++ b/samples/notebook/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib NOTEBOOK_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in index 1d0d6e8b7c..4d2bdad54c 100644 --- a/samples/oleauto/Makefile.in +++ b/samples/oleauto/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib OLEAUTO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in index 93c44642a8..b870a69ad4 100644 --- a/samples/opengl/cube/Makefile.in +++ b/samples/opengl/cube/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib CUBE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in index ec6a5136fa..ba6c84ea09 100644 --- a/samples/opengl/isosurf/Makefile.in +++ b/samples/opengl/isosurf/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib ISOSURF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in index cd5d9e0bfa..bf6f92de7b 100644 --- a/samples/opengl/penguin/Makefile.in +++ b/samples/opengl/penguin/Makefile.in @@ -44,7 +44,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib PENGUIN_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/opengl/pyramid/Makefile.in b/samples/opengl/pyramid/Makefile.in index fec47d7616..3717f50e3a 100644 --- a/samples/opengl/pyramid/Makefile.in +++ b/samples/opengl/pyramid/Makefile.in @@ -42,7 +42,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib PYRAMID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in index e9a805d717..ca632ed03e 100644 --- a/samples/ownerdrw/Makefile.in +++ b/samples/ownerdrw/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib OWNERDRW_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/popup/Makefile.in b/samples/popup/Makefile.in index 0bee55e6ae..f5ee9ea45d 100644 --- a/samples/popup/Makefile.in +++ b/samples/popup/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib POPUP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/power/Makefile.in b/samples/power/Makefile.in index 8057d940a3..4a4d3cb1cc 100644 --- a/samples/power/Makefile.in +++ b/samples/power/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib POWER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/preferences/Makefile.in b/samples/preferences/Makefile.in index e791885b28..bde2b0b488 100644 --- a/samples/preferences/Makefile.in +++ b/samples/preferences/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib PREFERENCES_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in index 888a1fe4c1..3e52b7b637 100644 --- a/samples/printing/Makefile.in +++ b/samples/printing/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib PRINTING_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/propgrid/Makefile.in b/samples/propgrid/Makefile.in index e5daff2296..435062c92a 100644 --- a/samples/propgrid/Makefile.in +++ b/samples/propgrid/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib PROPGRID_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in index 001aa862db..5c919b5d36 100644 --- a/samples/regtest/Makefile.in +++ b/samples/regtest/Makefile.in @@ -41,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 -WX_VERSION = $(WX_RELEASE).2 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(wx_top_builddir)/lib REGTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in index ca9053cb44..512fd136c5 100644 --- a/samples/render/Makefile.in +++ b/samples/render/Makefile.in @@ -50,8 +50,8 @@ wx_top_builddir = @wx_top_builddir@ DESTDIR = WX_RELEASE = 3.1 WX_RELEASE_NODOT = 31 -WX_VERSION = $(WX_RELEASE).2 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2 +WX_VERSION = $(WX_RELEASE).3 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 LIBDIRNAME = $(wx_top_builddir)/lib PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0) RENDER_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ diff --git a/samples/render/makefile.bcc b/samples/render/makefile.bcc index 65279c4cbe..6c79b4ec41 100644 --- a/samples/render/makefile.bcc +++ b/samples/render/makefile.bcc @@ -22,7 +22,7 @@ BCCDIR = $(MAKEDIR)\.. ### Variables: ### WX_RELEASE_NODOT = 31 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 COMPILER_PREFIX = bcc OBJS = \ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) diff --git a/samples/render/makefile.gcc b/samples/render/makefile.gcc index 305e82c4de..9b6149be57 100644 --- a/samples/render/makefile.gcc +++ b/samples/render/makefile.gcc @@ -14,7 +14,7 @@ include ../../build/msw/config.gcc CPPDEPS = -MT$@ -MF$@.d -MD -MP WX_RELEASE_NODOT = 31 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 COMPILER_PREFIX = gcc OBJS = \ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) diff --git a/samples/render/makefile.vc b/samples/render/makefile.vc index a5260c882d..a4ccf72d15 100644 --- a/samples/render/makefile.vc +++ b/samples/render/makefile.vc @@ -13,7 +13,7 @@ ### Variables: ### WX_RELEASE_NODOT = 31 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 COMPILER_PREFIX = vc OBJS = \ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) diff --git a/samples/render/render_vc7_renddll.vcproj b/samples/render/render_vc7_renddll.vcproj index dad8bd0396..e8ad523288 100644 --- a/samples/render/render_vc7_renddll.vcproj +++ b/samples/render/render_vc7_renddll.vcproj @@ -36,7 +36,7 @@ BufferSecurityCheck="TRUE" RuntimeTypeInfo="TRUE" ObjectFile="vc_mswuddll\renddll\" - ProgramDataBaseFileName="vc_mswuddll\renddll_mswud312_vc.pdb" + ProgramDataBaseFileName="vc_mswuddll\renddll_mswud313_vc.pdb" WarningLevel="4" SuppressStartupBanner="TRUE" Detect64BitPortabilityProblems="TRUE" @@ -47,12 +47,12 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" - OutputFile="vc_mswuddll\renddll_mswud312_vc.dll" + OutputFile="vc_mswuddll\renddll_mswud313_vc.dll" LinkIncremental="2" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateDebugInformation="TRUE" - ProgramDatabaseFile="vc_mswuddll\renddll_mswud312_vc.pdb" + ProgramDatabaseFile="vc_mswuddll\renddll_mswud313_vc.pdb" TargetMachine="1"/> diff --git a/samples/render/render_vc8_renddll.vcproj b/samples/render/render_vc8_renddll.vcproj index 336bdf2ef2..dd843c672a 100644 --- a/samples/render/render_vc8_renddll.vcproj +++ b/samples/render/render_vc8_renddll.vcproj @@ -62,7 +62,7 @@ BufferSecurityCheck="true" RuntimeTypeInfo="true" ObjectFile="vc_mswuddll\renddll\" - ProgramDataBaseFileName="vc_mswuddll\renddll_mswud312_vc.pdb" + ProgramDataBaseFileName="vc_mswuddll\renddll_mswud313_vc.pdb" WarningLevel="4" SuppressStartupBanner="true" Detect64BitPortabilityProblems="true" @@ -84,13 +84,13 @@ Name="VCLinkerTool" AdditionalOptions="" AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" - OutputFile="vc_mswuddll\renddll_mswud312_vc.dll" + OutputFile="vc_mswuddll\renddll_mswud313_vc.dll" LinkIncremental="2" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" - ProgramDatabaseFile="vc_mswuddll\renddll_mswud312_vc.pdb" + ProgramDatabaseFile="vc_mswuddll\renddll_mswud313_vc.pdb" TargetMachine="1" /> Date: Mon, 10 Dec 2018 18:55:42 +0100 Subject: [PATCH 38/77] Remove the list of changes since 3.1.1 from the README This will hopefully make things less confusing when preparing for the next release. --- docs/readme.txt | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/docs/readme.txt b/docs/readme.txt index cd9746f178..e9332ce9af 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -24,39 +24,12 @@ download from: * https://github.com/wxWidgets/wxWidgets/releases/tag/v3.1.3/ -Changes since 3.1.1 +Changes since 3.1.2 ------------------- -There have been more than 1200 commits from 75 contributors (41 with multiple -contributions) since 3.1.1 release. This release primarily contains bug fixes -(closing more than 100 bugs from wxTrac) and incremental improvements in -preparation for the next stable 3.2.0 release, however there is a usual lot of -new features as well, including: +TODO: Fill in -- Initial support for macOS 10.14 and its dark mode. -- Support for non-integer font sizes and arbitrary font weights. -- New wxLZMA{Input,Output}Stream classes. -- Add wxDataViewToggleRenderer::ShowAsRadio(), wxDisplay::GetPPI(), - wxGrid::SetCornerLabelValue(), wxHtmlEasyPrinting::SetPromptMode(), - wxJoystickEvent::GetButtonOrdinal(), wxToolbook::EnablePage(). - -Some of the other improvements: - -- There were again many improvements to the (still experimental) wxQt port. -- Fix several bugs related to focus handling and TAB navigation in wxGTK. -- Make it possible to control pagination in wxHTML more precisely. -- Fix several problems with high-DPI displays. -- wxOSX now uses native NSImage/UIImage representation for wxBitmap. -- Support strike-through font attribute in XRC and wxDataViewCtrl markup too. -- Support more than 4 buttons in wxJoystick. -- Add wxwidgets.props property sheet file for MSVS users. - -Please refer to the detailed change log for the full list of changes: - -https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.1.3/docs/changes.txt - - -Notice that this release is almost completely compatible with 3.1.1 at the API +Notice that this release is almost completely compatible with 3.1.2 at the API level, so upgrading to it if you're already using wxWidgets 3 should be straightforward. From cf28473d9fc6e04df3ccb6de7d93301c2b823a61 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 10 Dec 2018 18:56:19 +0100 Subject: [PATCH 39/77] Mention that wx.bkl doesn't need to be updated for micro releases Only WX_VERSION_DEFAULT value, which doesn't include the micro version component, needs to be updated in this file. --- docs/contributing/about-version-numbers.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/contributing/about-version-numbers.md b/docs/contributing/about-version-numbers.md index 7c6ea11aa1..372eb50b65 100644 --- a/docs/contributing/about-version-numbers.md +++ b/docs/contributing/about-version-numbers.md @@ -6,7 +6,7 @@ All about wxWidgets Version Numbers There are several places in the wxWidgets source tree that define the version number for the library. -The script misc/scripts/inc_release can be used for incrementing the release +The script `misc/scripts/inc_release` can be used for incrementing the release field of the version, i.e. changing 2.8.x to 2.8.x+1 but it does not take care of version.bkl and can't be used for changing the other version components, this needs to be done manually. It also doesn't update @@ -16,7 +16,7 @@ instructions there. Here is the list of files that need to be updated: build/bakefiles/version.bkl {C:R:A} [NOT UPDATED AUTOMATICALLY] - build/bakefiles/wxpresets/presets/wx.bkl [NOT UPDATED AUTOMATICALLY] + build/bakefiles/wxpresets/presets/wx.bkl [NOT UPDATED AUTOMATICALLY, not-micro] configure.in build/osx/wxvers.xcconfig docs/changes.txt @@ -27,7 +27,7 @@ Here is the list of files that need to be updated: include/wx/osx/config_xcode.h samples/docview/Info.plist samples/minimal/Info_cocoa.plist - samples/minimal/borland_ide.cpp {major release only} + samples/minimal/borland_ide.cpp [not-micro] Do not forget to rebake everything after updating version.bkl! From 251561172a886d45ef355473ec31525caaab1ce3 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 10 Dec 2018 18:59:03 +0100 Subject: [PATCH 40/77] Remove mentions of non-existent docs/$toolkit/install.txt Don't include these files in "make dist" (which seems completely unused anyhow, and probably broken because of this). --- Makefile.in | 1 - build/bakefiles/make_dist.mk | 1 - docs/base/readme.txt | 2 +- docs/index.htm | 12 ++++++------ docs/readme.txt | 6 ++++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile.in b/Makefile.in index 59f1e05acc..c07f2d317d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -36866,7 +36866,6 @@ ALL_DIST: distrib_clean # but is not used when building wxBase distribution ALL_GUI_DIST: ALL_DIST $(CP_P) $(DOCDIR)/readme.txt $(DISTDIR)/README.txt - $(CP_P) $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \ $(CP_P) $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES-$(TOOLKIT).txt ; fi $(CP_P) $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README-$(TOOLKIT).txt diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk index ced718bac6..839aa9938f 100644 --- a/build/bakefiles/make_dist.mk +++ b/build/bakefiles/make_dist.mk @@ -142,7 +142,6 @@ ALL_DIST: distrib_clean # but is not used when building wxBase distribution ALL_GUI_DIST: ALL_DIST $(CP_P) $(DOCDIR)/readme.txt $(DISTDIR)/README.txt - $(CP_P) $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt if test -f $(DOCDIR)/$(TOOLKITDIR)/changes.txt ; then \ $(CP_P) $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES-$(TOOLKIT).txt ; fi $(CP_P) $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README-$(TOOLKIT).txt diff --git a/docs/base/readme.txt b/docs/base/readme.txt index 22c3eb7572..015a970c79 100644 --- a/docs/base/readme.txt +++ b/docs/base/readme.txt @@ -65,7 +65,7 @@ b) Cygwin c) Borland - Please refer to the docs/msw/install.txt. The console sample compiles and + Please refer to the docs/msw/install.md. The console sample compiles and runs but does not pass all tests. d) Other compilers diff --git a/docs/index.htm b/docs/index.htm index 880723d2f0..5d1c28d77e 100644 --- a/docs/index.htm +++ b/docs/index.htm @@ -51,12 +51,12 @@ wxiOS
  • Installation: - wxMSW, - wxGTK, - wxMotif, - wxX11, - wxOSX, - wxQt, + wxMSW, + wxGTK, + wxMotif, + wxX11, + wxOSX, + wxQt,
  • General change log
  • Licence: diff --git a/docs/readme.txt b/docs/readme.txt index e9332ce9af..a831d5a500 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -111,8 +111,10 @@ Installation Unless you have downloaded the binaries for your compiler, you will need to build wxWidgets before you can test out the samples or write your own -applications. For installation information, please see the install.txt file in -the docs subdirectory appropriate for the platform you use. +applications. For installation information, please see the install.md files in +the docs subdirectory appropriate for the platform you use or the "Platform +Details" page of the manual, which contains links to the rendered versions of +these files. Licence From 611f678b51bf52dcd22356b515e6c51179fe808f Mon Sep 17 00:00:00 2001 From: Graham Dawes Date: Fri, 7 Dec 2018 16:30:47 +0000 Subject: [PATCH 41/77] Implement of wxFontEnumerator::EnumerateFacenames() in wxQt Closes https://github.com/wxWidgets/wxWidgets/pull/1056 --- src/qt/fontenum.cpp | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/qt/fontenum.cpp b/src/qt/fontenum.cpp index c47692ee36..51f7270ef7 100644 --- a/src/qt/fontenum.cpp +++ b/src/qt/fontenum.cpp @@ -9,11 +9,28 @@ #include "wx/wxprec.h" #include "wx/fontenum.h" +#include "wx/qt/private/converter.h" -bool wxFontEnumerator::EnumerateFacenames( wxFontEncoding WXUNUSED(encoding), - bool WXUNUSED(fixedWidthOnly)) +#include +#include + +bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding WXUNUSED(encoding), bool fixedWidthOnly) { - return false; + QFontDatabase fontDatabase; + const QStringList allFonts = fontDatabase.families(QFontDatabase::Any); + for( QStringList::const_iterator i = allFonts.begin(); i != allFonts.end(); ++i ) + { + const QString& fontFamily = *i; + if ( !fixedWidthOnly || fontDatabase.isFixedPitch(fontFamily) ) + { + if ( !OnFacename(wxQtConvertString(fontFamily)) ) + { + break; + } + } + } + + return true; } bool wxFontEnumerator::EnumerateEncodings(const wxString& WXUNUSED(facename)) From 8ec8a0cf6663ec398bc89f3d1fa02d8bf66aff21 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 10 Dec 2018 19:31:40 +0100 Subject: [PATCH 42/77] Define WX_WEB_EXTENSIONS_DIRECTORY in static builds too This definition is needed when building both shared and static webview library when using WebKit 2, but for some reason wasn't included for the latter. Closes https://github.com/wxWidgets/wxWidgets/pull/1061 --- Makefile.in | 12 +++++++----- build/bakefiles/multilib.bkl | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index c07f2d317d..a996c31157 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1667,12 +1667,14 @@ WEBVIEWLIB_CXXFLAGS = $(__webviewlib_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \ $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) + $(__INC_REGEX_p) $(__INC_EXPAT_p) $(__webviewdll_ext_dir_define_p) \ + $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS) WEBVIEWLIB_OBJCXXFLAGS = $(__webviewlib_PCH_INC) -D__WX$(TOOLKIT)__ \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \ $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \ - $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(OBJCXXFLAGS) + $(__INC_REGEX_p) $(__INC_EXPAT_p) $(__webviewdll_ext_dir_define_p) \ + $(CPPFLAGS) $(OBJCXXFLAGS) WEBVIEWLIB_OBJECTS = \ $(__WEBVIEW_SRC_PLATFORM_OBJECTS_3) \ webviewlib_webview.o \ @@ -13386,9 +13388,6 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_17 = \ monolib_core_timer.o \ monolib_utilsexc_cf.o @COND_PLATFORM_MACOSX_1@__OSX_LOWLEVEL_SRC_OBJECTS_17 = $(COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_17) -@COND_USE_WEBVIEW_WEBKIT2_1@__webviewdll_ext_dir_define_p \ -@COND_USE_WEBVIEW_WEBKIT2_1@ = \ -@COND_USE_WEBVIEW_WEBKIT2_1@ -DWX_WEB_EXTENSIONS_DIRECTORY=\"$(PLUGINS_INST_DIR)/web-extensions\" @COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_8 = coredll_unix_apptraits.o @COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS_8 = coredll_unix_apptraits.o COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_8 = \ @@ -13665,6 +13664,9 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_4 = \ corelib_core_timer.o \ corelib_utilsexc_cf.o @COND_PLATFORM_MACOSX_1@__OSX_LOWLEVEL_SRC_OBJECTS_1_4 = $(COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_4) +@COND_USE_WEBVIEW_WEBKIT2_1@__webviewdll_ext_dir_define_p \ +@COND_USE_WEBVIEW_WEBKIT2_1@ = \ +@COND_USE_WEBVIEW_WEBKIT2_1@ -DWX_WEB_EXTENSIONS_DIRECTORY=\"$(PLUGINS_INST_DIR)/web-extensions\" @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll_library_link_DEP \ @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@ = $(__htmldll___depname) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll_library_link_LIBR \ diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl index 0aab9c3236..dedebdb51a 100644 --- a/build/bakefiles/multilib.bkl +++ b/build/bakefiles/multilib.bkl @@ -190,6 +190,7 @@ + $(webviewdll_ext_dir_define) $(WEBVIEW_SRC) $(WEBVIEW_HDR) From 0c2956be091f1040314a48181333e530dc50ebe8 Mon Sep 17 00:00:00 2001 From: Stefan Ziegler Date: Mon, 10 Dec 2018 10:47:56 +0100 Subject: [PATCH 43/77] Fix wxInfoBar close button size in high DPI Don't apply the scaling factor twice when dynamically creating the close button bitmap. Closes https://github.com/wxWidgets/wxWidgets/pull/1063 Closes #18283. --- docs/changes.txt | 8 ++++++++ src/common/bmpbtncmn.cpp | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index ea37991c44..fd1b14acb7 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -102,6 +102,14 @@ Changes in behaviour which may result in build errors removing its name. +3.1.3: (released 2019-??-??) +---------------------------- + +All (GUI): + +- Fix wxInfoBar close button size in high DPI (Stefan Ziegler). + + 3.1.2: (released 2018-12-10) ---------------------------- diff --git a/src/common/bmpbtncmn.cpp b/src/common/bmpbtncmn.cpp index ff2ea043ce..039f977c54 100644 --- a/src/common/bmpbtncmn.cpp +++ b/src/common/bmpbtncmn.cpp @@ -103,13 +103,13 @@ GetCloseButtonBitmap(wxWindow *win, const wxColour& colBg, int flags = 0) { + // size is physical here because it comes from wxArtProvider::GetSizeHint wxBitmap bmp; - bmp.CreateScaled(size.x, size.y, wxBITMAP_SCREEN_DEPTH, win->GetContentScaleFactor()); + bmp.Create(size.x, size.y, wxBITMAP_SCREEN_DEPTH); wxMemoryDC dc(bmp); dc.SetBackground(colBg); dc.Clear(); - wxRendererNative::Get(). - DrawTitleBarBitmap(win, dc, win->FromDIP(size), wxTITLEBAR_BUTTON_CLOSE, flags); + wxRendererNative::Get().DrawTitleBarBitmap(win, dc, size, wxTITLEBAR_BUTTON_CLOSE, flags); return bmp; } From 91a87e765b7b47ac09a5b464985af8220c0a8f6d Mon Sep 17 00:00:00 2001 From: Liam Treacy Date: Mon, 10 Dec 2018 11:23:50 +0000 Subject: [PATCH 44/77] Don't omit "int" in wxQt wxRadioBox::GetCount() signature No real changes, just use "unsigned int" instead of just "unsigned". See https://github.com/wxWidgets/wxWidgets/pull/1064 --- src/qt/radiobox.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt/radiobox.cpp b/src/qt/radiobox.cpp index 32ccb686b1..693e673170 100644 --- a/src/qt/radiobox.cpp +++ b/src/qt/radiobox.cpp @@ -200,7 +200,7 @@ bool wxRadioBox::IsItemShown(unsigned int n) const return qtButton->isVisible(); } -unsigned wxRadioBox::GetCount() const +unsigned int wxRadioBox::GetCount() const { QList< QAbstractButton * > buttons = m_qtButtonGroup->buttons(); return buttons.size(); From 2a64b6514921b6b24e1ca4ba1d0194bcc88e8f02 Mon Sep 17 00:00:00 2001 From: Liam Treacy Date: Mon, 10 Dec 2018 11:23:50 +0000 Subject: [PATCH 45/77] Fix enabling radiobox buttons in wxQt If a QGroupBox is disabled, then you cannot set any of its items to be enabled without first enabling it. Enabling/disabling it will set that value (true/false) on all of its items, although setting the QGroupBox to an enabled state which it already has does not result in this behaviour. Fix wxQt to match the expected wxRadioBox behaviour and allow the unit test to pass. Closes https://github.com/wxWidgets/wxWidgets/pull/1064 --- include/wx/qt/radiobox.h | 9 +++++---- src/qt/radiobox.cpp | 38 +++++++++++++++++++++++++++++++++++--- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/include/wx/qt/radiobox.h b/include/wx/qt/radiobox.h index f858a576f6..2c84083aa3 100644 --- a/include/wx/qt/radiobox.h +++ b/include/wx/qt/radiobox.h @@ -65,10 +65,11 @@ public: using wxWindowBase::Enable; using wxRadioBoxBase::GetDefaultBorder; - virtual bool Enable(unsigned int n, bool enable = true); - virtual bool Show(unsigned int n, bool show = true); - virtual bool IsItemEnabled(unsigned int n) const; - virtual bool IsItemShown(unsigned int n) const; + virtual bool Enable(unsigned int n, bool enable = true) wxOVERRIDE; + virtual bool Enable(bool enable = true) wxOVERRIDE; + virtual bool Show(unsigned int n, bool show = true) wxOVERRIDE; + virtual bool IsItemEnabled(unsigned int n) const wxOVERRIDE; + virtual bool IsItemShown(unsigned int n) const wxOVERRIDE; virtual unsigned int GetCount() const; virtual wxString GetString(unsigned int n) const; diff --git a/src/qt/radiobox.cpp b/src/qt/radiobox.cpp index 693e673170..beede99053 100644 --- a/src/qt/radiobox.cpp +++ b/src/qt/radiobox.cpp @@ -168,10 +168,42 @@ static QAbstractButton *GetButtonAt( const QButtonGroup *group, unsigned int n ) bool wxRadioBox::Enable(unsigned int n, bool enable) { - QAbstractButton *qtButton = GetButtonAt( m_qtButtonGroup, n ); - CHECK_BUTTON( qtButton, false ); + if ( enable && !m_qtGroupBox->isEnabled() ) + { + m_qtGroupBox->setEnabled( true ); + + for ( unsigned int i = 0; i < GetCount(); ++i ) + { + QAbstractButton *qtButton = GetButtonAt( m_qtButtonGroup, i ); + CHECK_BUTTON( qtButton, false ); + + qtButton->setEnabled( i == n ); + } + } + else + { + QAbstractButton *qtButton = GetButtonAt( m_qtButtonGroup, n ); + CHECK_BUTTON( qtButton, false ); + qtButton->setEnabled(enable); + } + + return true; +} + +bool wxRadioBox::Enable( bool enable ) +{ + if ( m_qtGroupBox->isEnabled() == enable ) + { + for ( unsigned int i = 0; i < GetCount(); ++i ) + { + QAbstractButton *qtButton = GetButtonAt( m_qtButtonGroup, i ); + CHECK_BUTTON( qtButton, false ); + qtButton->setEnabled( enable ); + } + } + + m_qtGroupBox->setEnabled( enable ); - qtButton->setEnabled( enable ); return true; } From 418a1b747e28614ca07e41f413b636a35fe2a3ef Mon Sep 17 00:00:00 2001 From: Liam Treacy Date: Mon, 10 Dec 2018 13:57:14 +0000 Subject: [PATCH 46/77] Select first item of wxRadioBox by default in wxQt too Follow the other ports and select the first radio box item when it's created, to ensure that it always has selection. See https://github.com/wxWidgets/wxWidgets/pull/1065 --- src/qt/radiobox.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qt/radiobox.cpp b/src/qt/radiobox.cpp index beede99053..b02c5a1596 100644 --- a/src/qt/radiobox.cpp +++ b/src/qt/radiobox.cpp @@ -111,11 +111,19 @@ template < typename Button > static void AddChoices( QButtonGroup *qtButtonGroup, QBoxLayout *qtBoxLayout, int count, const wxString choices[] ) { Button *btn; + bool isFirst = true; + while ( count-- > 0 ) { btn = new Button( wxQtConvertString( *choices++ )); qtButtonGroup->addButton( btn ); qtBoxLayout->addWidget( btn ); + + if ( isFirst ) + { + btn->setChecked(true); + isFirst = false; + } } } From e7260cffe0cfeacb859bfe161ee29c4190026683 Mon Sep 17 00:00:00 2001 From: Liam Treacy Date: Mon, 10 Dec 2018 14:11:37 +0000 Subject: [PATCH 47/77] Fix wxRadioBox::Show() behaviour in wxQt If a QGroupBox is not visible, then you cannot set any of items to be visible. Update the implementation to match that expected by wx. Closes https://github.com/wxWidgets/wxWidgets/pull/1065 --- include/wx/qt/radiobox.h | 1 + src/qt/radiobox.cpp | 39 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/include/wx/qt/radiobox.h b/include/wx/qt/radiobox.h index 2c84083aa3..679298b83b 100644 --- a/include/wx/qt/radiobox.h +++ b/include/wx/qt/radiobox.h @@ -68,6 +68,7 @@ public: virtual bool Enable(unsigned int n, bool enable = true) wxOVERRIDE; virtual bool Enable(bool enable = true) wxOVERRIDE; virtual bool Show(unsigned int n, bool show = true) wxOVERRIDE; + virtual bool Show(bool show = true) wxOVERRIDE; virtual bool IsItemEnabled(unsigned int n) const wxOVERRIDE; virtual bool IsItemShown(unsigned int n) const wxOVERRIDE; diff --git a/src/qt/radiobox.cpp b/src/qt/radiobox.cpp index b02c5a1596..b8c82a8a37 100644 --- a/src/qt/radiobox.cpp +++ b/src/qt/radiobox.cpp @@ -217,10 +217,43 @@ bool wxRadioBox::Enable( bool enable ) bool wxRadioBox::Show(unsigned int n, bool show) { - QAbstractButton *qtButton = GetButtonAt( m_qtButtonGroup, n ); - CHECK_BUTTON( qtButton, false ); + if ( show && !m_qtGroupBox->isVisible() ) + { + m_qtGroupBox->setVisible(true); + + for ( unsigned int i = 0; i < GetCount(); ++i ) + { + QAbstractButton *qtButton = GetButtonAt( m_qtButtonGroup, i ); + CHECK_BUTTON( qtButton, false ); + + i == n ? qtButton->setVisible( true ) : qtButton->setVisible( false ); + } + } + else + { + QAbstractButton *qtButton = GetButtonAt( m_qtButtonGroup, n ); + CHECK_BUTTON( qtButton, false ); + + qtButton->setVisible( show ); + } + + return true; +} + +bool wxRadioBox::Show( bool show ) +{ + if( m_qtGroupBox->isVisible() == show ) + { + for( unsigned int i = 0; i < GetCount(); ++i ) + { + QAbstractButton *qtButton = GetButtonAt( m_qtButtonGroup, i ); + CHECK_BUTTON( qtButton, false ); + qtButton->setVisible( show ); + } + } + + m_qtGroupBox->setVisible( show ); - qtButton->setVisible( show ); return true; } From 3a24beca62c1130b887bb53ef40de5076a11e257 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 12 Dec 2018 18:01:41 +0100 Subject: [PATCH 48/77] Document that wxDataViewCtrl now always expands its last column This has been changed back in 4156e1a5c94283cb037132518dfb80dbc1403e12 and is a (mildly) incompatible change, so document it in the appropriate change log section. See #18295. --- docs/changes.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/changes.txt b/docs/changes.txt index fd1b14acb7..b5779afb0b 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -94,6 +94,9 @@ Changes in behaviour which may result in build errors not long. Its return value hasn't changed, however, and is still always either true or false, so normally the existing code should continue to work. +- Generic wxDataViewCtrl now always resizes its last column to fill all the + available space, as the GTK+ version always did. + - configure only accepts the options it knows about now and doesn't silently ignore all the rest. If you get errors about unknown options, you may either specify --disable-option-checking argument to continue accepting them (which From 6c5c9e578b7e6feb826f47ad7776ca84ee91973b Mon Sep 17 00:00:00 2001 From: Graham Dawes Date: Wed, 12 Dec 2018 09:21:14 +0000 Subject: [PATCH 49/77] wxCarioContext:Flush now draws back to the QT image wxCairoContext::Flush was flushing back to the internal image but this image wasn't drawn back to the QPainter until the wxCarioContext instance was destroyed. This fix ensure that after a call to Flush, anything drawn by Cario is drawn back to the QImage. Closes https://github.com/wxWidgets/wxWidgets/pull/1068 --- src/generic/graphicc.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp index ebebea96df..a610eabf64 100644 --- a/src/generic/graphicc.cpp +++ b/src/generic/graphicc.cpp @@ -2566,6 +2566,7 @@ void wxCairoContext::Flush() if ( m_qtSurface ) { cairo_surface_flush(m_qtSurface); + m_qtPainter->drawImage( 0,0, *m_qtImage ); } #endif } From 331dc1fdfe3aa1a2df6c0fa97ffe2bd2c92b2b24 Mon Sep 17 00:00:00 2001 From: Graham Dawes Date: Wed, 12 Dec 2018 09:59:49 +0000 Subject: [PATCH 50/77] Change wxFont::GetEncoding to return UTF8 for wxQt QT doesn't have the concept of font encoding and is generally Unicode aware throughout. The previous implementation of wxFont::GetEncoding for wxQT returned a nonsensical value. Closes https://github.com/wxWidgets/wxWidgets/pull/1070 --- src/qt/font.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/qt/font.cpp b/src/qt/font.cpp index 7e328d099a..c01903ec42 100644 --- a/src/qt/font.cpp +++ b/src/qt/font.cpp @@ -451,10 +451,7 @@ wxFontFamily wxNativeFontInfo::GetFamily() const wxFontEncoding wxNativeFontInfo::GetEncoding() const { -// QFontInfo info = QFontInfo(m_qtFont); - wxMISSING_IMPLEMENTATION( __FUNCTION__ ); - - return wxFONTENCODING_MAX; + return wxFONTENCODING_UTF8; } void wxNativeFontInfo::SetFractionalPointSize(float pointsize) From ac55d06bc194acf704b1b6b10ad73ded8d9de779 Mon Sep 17 00:00:00 2001 From: Graham Dawes Date: Wed, 12 Dec 2018 10:27:11 +0000 Subject: [PATCH 51/77] Fix a crash when setting a menu icon to a null bitmap in wxQt Previous implementation didn't take into account that wxBitmap::GetHandle() could return NULL for wxQt. Specifically when wxBitmap::IsNull returns true. Closes https://github.com/wxWidgets/wxWidgets/pull/1071 --- src/qt/menuitem.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qt/menuitem.cpp b/src/qt/menuitem.cpp index fa729e33de..59f82e32a2 100644 --- a/src/qt/menuitem.cpp +++ b/src/qt/menuitem.cpp @@ -111,7 +111,10 @@ void wxMenuItem::SetBitmap(const wxBitmap& bitmap) if ( m_kind == wxITEM_NORMAL ) { m_bitmap = bitmap; - m_qtAction->setIcon( QIcon( *m_bitmap.GetHandle() ) ); + if ( !m_bitmap.IsNull() ) + { + m_qtAction->setIcon( QIcon(*m_bitmap.GetHandle()) ); + } } else { From 9f21af693c0cebc5ddfb94dfc1eef9287ae892db Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Sun, 9 Dec 2018 15:51:14 +0100 Subject: [PATCH 52/77] CMake: Install wxrc on all platforms, closes #18289 --- build/cmake/utils/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt index a242fdec66..21acfa3dfe 100644 --- a/build/cmake/utils/CMakeLists.txt +++ b/build/cmake/utils/CMakeLists.txt @@ -20,8 +20,8 @@ if(wxUSE_XRC) set_target_properties(wxrc PROPERTIES FOLDER "Utilities") + wx_install(TARGETS wxrc RUNTIME DESTINATION "bin") if(UNIX) - wx_install(TARGETS wxrc RUNTIME DESTINATION "bin") install(CODE "execute_process( \ COMMAND ${CMAKE_COMMAND} -E rename \ ${CMAKE_INSTALL_PREFIX}/bin/wxrc \ From 981555b7889a3d31f874915d01c5b36d2b6e4175 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Sun, 9 Dec 2018 15:55:04 +0100 Subject: [PATCH 53/77] CMake: Do not add -pthread to link flags with clang on Windows It causes argument unused warnings. --- build/cmake/functions.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake index 088d685eb2..dfab1ccc95 100644 --- a/build/cmake/functions.cmake +++ b/build/cmake/functions.cmake @@ -105,9 +105,13 @@ function(wx_set_common_target_properties target_name) endif() # TODO: add warning flags for other compilers endif() + if(CMAKE_USE_PTHREADS_INIT) target_compile_options(${target_name} PRIVATE "-pthread") - set_target_properties(${target_name} PROPERTIES LINK_FLAGS "-pthread") + # clang++.exe: warning: argument unused during compilation: '-pthread' [-Wunused-command-line-argument] + if(NOT (WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")) + set_target_properties(${target_name} PROPERTIES LINK_FLAGS "-pthread") + endif() endif() endfunction() From 0665db6c1d8004978bedda4e58d934c014688396 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Tue, 11 Dec 2018 20:36:47 +0100 Subject: [PATCH 54/77] CMake: Fix html zip sample dependency check --- build/cmake/samples/html.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/cmake/samples/html.cmake b/build/cmake/samples/html.cmake index 402d0618d2..a13c405e9f 100644 --- a/build/cmake/samples/html.cmake +++ b/build/cmake/samples/html.cmake @@ -37,7 +37,7 @@ wx_add_sample(test LIBRARIES net html NAME htmltest) wx_add_sample(virtual DATA start.htm LIBRARIES html) wx_add_sample(widget DATA start.htm LIBRARIES html) -wx_add_sample(zip DATA pages.zip start.htm LIBRARIES html DEPENDS wxUSE_FSZIP) +wx_add_sample(zip DATA pages.zip start.htm LIBRARIES html DEPENDS wxUSE_FS_ZIP) set(wxSAMPLE_SUBDIR) set(wxSAMPLE_FOLDER) From 79344fc5b6f0a561b4ec6e6ec52e4149929ab9f6 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Tue, 11 Dec 2018 20:37:41 +0100 Subject: [PATCH 55/77] CMake: Fix locale_t type check Test failed when xlocale.h did not exist. --- build/cmake/setup.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build/cmake/setup.cmake b/build/cmake/setup.cmake index 5656b9dc30..c3d66de91e 100644 --- a/build/cmake/setup.cmake +++ b/build/cmake/setup.cmake @@ -641,7 +641,10 @@ endif() if(wxUSE_XLOCALE) check_include_file(xlocale.h HAVE_XLOCALE_H) - set(CMAKE_EXTRA_INCLUDE_FILES xlocale.h locale.h) + set(CMAKE_EXTRA_INCLUDE_FILES locale.h) + if(HAVE_XLOCALE_H) + list(APPEND CMAKE_EXTRA_INCLUDE_FILES xlocale.h) + endif() check_type_size(locale_t LOCALE_T) set(CMAKE_EXTRA_INCLUDE_FILES) endif() From 14570b4fa3f385c979601148d4804a66bab09209 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Tue, 11 Dec 2018 20:49:14 +0100 Subject: [PATCH 56/77] CMake: Find more external libraries Check for LibNotify, MSpack, XTest and GnomeVFS2. --- build/cmake/init.cmake | 53 +++++++++++++++ build/cmake/lib/core/CMakeLists.txt | 4 ++ build/cmake/lib/html/CMakeLists.txt | 7 +- build/cmake/modules/FindGnomeVFS2.cmake | 90 +++++++++++++++++++++++++ build/cmake/modules/FindLibNotify.cmake | 55 +++++++++++++++ build/cmake/modules/FindMSPACK.cmake | 40 +++++++++++ build/cmake/modules/FindXTest.cmake | 51 ++++++++++++++ build/cmake/options.cmake | 6 +- 8 files changed, 304 insertions(+), 2 deletions(-) create mode 100644 build/cmake/modules/FindGnomeVFS2.cmake create mode 100644 build/cmake/modules/FindLibNotify.cmake create mode 100644 build/cmake/modules/FindMSPACK.cmake create mode 100644 build/cmake/modules/FindXTest.cmake diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake index b5b207924a..462bb50729 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake @@ -295,4 +295,57 @@ if(wxUSE_GUI) wx_option_force_value(wxUSE_LIBSDL OFF) endif() endif() + + if(wxUSE_NOTIFICATION_MESSAGE AND UNIX AND WXGTK2 AND wxUSE_LIBNOTIFY) + find_package(LibNotify) + if(NOT LIBNOTIFY_FOUND) + message(WARNING "Libnotify not found, it won't be used for notifications") + wx_option_force_value(wxUSE_LIBNOTIFY OFF) + elseif((LIBNOTIFY_VERSION GREATER 0.7) OR (LIBNOTIFY_VERSION EQUAL 0.7)) + set(wxUSE_LIBNOTIFY_0_7 ON) + endif() + endif() + + if(wxUSE_UIACTIONSIMULATOR AND UNIX AND WXGTK) + if(wxUSE_XTEST) + find_package(XTest) + if(XTEST_FOUND) + list(APPEND wxTOOLKIT_INCLUDE_DIRS ${XTEST_INCLUDE_DIRS}) + list(APPEND wxTOOLKIT_LIBRARIES ${XTEST_LIBRARIES}) + else() + if(WXGTK3) + # This class can't work without XTest with GTK+ 3 + # which uses XInput2 and so ignores XSendEvent(). + message(STATUS "XTest not found, wxUIActionSimulator won't be available") + wx_option_force_value(wxUSE_UIACTIONSIMULATOR OFF) + endif() + # The other ports can use XSendEvent(), so don't warn + wx_option_force_value(wxUSE_XTEST OFF) + endif() + else(WXGTK3) + # As per above, wxUIActionSimulator can't be used in this case, + # but there is no need to warn, presumably the user knows what + # he's doing if wxUSE_XTEST was explicitly disabled. + wx_option_force_value(wxUSE_UIACTIONSIMULATOR OFF) + endif() + endif() + + if(wxUSE_HTML AND UNIX AND wxUSE_LIBMSPACK) + find_package(MSPACK) + if(NOT MSPACK_FOUND) + message(STATUS "libmspack not found") + wx_option_force_value(wxUSE_LIBMSPACK OFF) + endif() + endif() + + if(WXGTK2 AND wxUSE_MIMETYPE AND wxUSE_LIBGNOMEVFS) + find_package(GnomeVFS2) + if(GNOMEVFS2_FOUND) + list(APPEND wxTOOLKIT_INCLUDE_DIRS ${GNOMEVFS2_INCLUDE_DIRS}) + list(APPEND wxTOOLKIT_LIBRARIES ${GNOMEVFS2_LIBRARIES}) + else() + message(STATUS "libgnomevfs not found, library won't be used to associate MIME type") + wx_option_force_value(wxUSE_LIBGNOMEVFS OFF) + endif() + endif() endif() diff --git a/build/cmake/lib/core/CMakeLists.txt b/build/cmake/lib/core/CMakeLists.txt index 54c2810051..439b4c567b 100644 --- a/build/cmake/lib/core/CMakeLists.txt +++ b/build/cmake/lib/core/CMakeLists.txt @@ -86,5 +86,9 @@ if(UNIX AND wxUSE_LIBSDL) wx_lib_link_libraries(core PUBLIC ${SDL_LIBRARY}) endif() endif() +if(wxUSE_LIBNOTIFY) + wx_lib_include_directories(core PUBLIC ${LIBNOTIFY_INCLUDE_DIRS}) + wx_lib_link_libraries(core PUBLIC ${LIBNOTIFY_LIBRARIES}) +endif() wx_finalize_lib(core) diff --git a/build/cmake/lib/html/CMakeLists.txt b/build/cmake/lib/html/CMakeLists.txt index b9dbd5a553..d4b8b6d19c 100644 --- a/build/cmake/lib/html/CMakeLists.txt +++ b/build/cmake/lib/html/CMakeLists.txt @@ -11,10 +11,15 @@ include(../../source_groups.cmake) wx_append_sources(HTML_FILES HTML_CMN) -if(WIN32) +if(WIN32 OR wxUSE_LIBMSPACK) wx_append_sources(HTML_FILES HTML_MSW) endif() wx_add_library(html ${HTML_FILES}) +if(wxUSE_LIBMSPACK) + wx_lib_include_directories(html PRIVATE ${MSPACK_INCLUDE_DIRS}) + wx_lib_link_libraries(html PRIVATE ${MSPACK_LIBRARIES}) +endif() + wx_finalize_lib(html) diff --git a/build/cmake/modules/FindGnomeVFS2.cmake b/build/cmake/modules/FindGnomeVFS2.cmake new file mode 100644 index 0000000000..d942addac3 --- /dev/null +++ b/build/cmake/modules/FindGnomeVFS2.cmake @@ -0,0 +1,90 @@ +# - Try to find GnomeVFS2 +# Once done this will define +# +# GNOMEVFS2_FOUND - system has GnomeVFS2 +# GNOMEVFS2_INCLUDE_DIRS - the GnomeVFS2 include directory +# GNOMEVFS2_LIBRARIES - Link these to use GnomeVFS2 +# GNOMEVFS2_DEFINITIONS - Compiler switches required for using GnomeVFS2 +# +# Copyright (c) 2008 Joshua L. Blocher +# +# Redistribution and use is allowed according to the terms of the New +# BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# + + +if (GNOMEVFS2_LIBRARIES AND GNOMEVFS2_INCLUDE_DIRS) + # in cache already + set(GNOMEVFS2_FOUND TRUE) +else (GNOMEVFS2_LIBRARIES AND GNOMEVFS2_INCLUDE_DIRS) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) + include(UsePkgConfig) + pkgconfig(gnome-vfs-2.0 _GNOMEVFS2_INCLUDEDIR _GNOMEVFS2_LIBDIR _GNOMEVFS2_LDFLAGS _GNOMEVFS2_CFLAGS) + else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) + find_package(PkgConfig) + if (PKG_CONFIG_FOUND) + pkg_check_modules(_GNOMEVFS2 gnome-vfs-2.0) + endif (PKG_CONFIG_FOUND) + endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) + find_path(GNOMEVFS2_INCLUDE_DIR + NAMES + libgnomevfs/gnome-vfs.h + PATHS + ${_GNOMEVFS2_INCLUDEDIR} + /usr/include + /usr/local/include + /opt/local/include + /sw/include + $ENV{DEVLIBS_PATH}//include// + PATH_SUFFIXES + gnome-vfs-2.0 + ) + + find_library(GNOMEVFS-2_LIBRARY + NAMES + gnomevfs-2 + PATHS + ${_GNOMEVFS2_LIBDIR} + /usr/lib + /usr/local/lib + /opt/local/lib + /sw/lib + ) + + if (GNOMEVFS-2_LIBRARY) + set(GNOMEVFS-2_FOUND TRUE) + endif (GNOMEVFS-2_LIBRARY) + + set(GNOMEVFS2_INCLUDE_DIRS + ${GNOMEVFS2_INCLUDE_DIR} + ) + + if (GNOMEVFS-2_FOUND) + set(GNOMEVFS2_LIBRARIES + ${GNOMEVFS2_LIBRARIES} + ${GNOMEVFS-2_LIBRARY} + ) + endif (GNOMEVFS-2_FOUND) + + if (GNOMEVFS2_INCLUDE_DIRS AND GNOMEVFS2_LIBRARIES) + set(GNOMEVFS2_FOUND TRUE) + endif (GNOMEVFS2_INCLUDE_DIRS AND GNOMEVFS2_LIBRARIES) + + if (GNOMEVFS2_FOUND) + if (NOT GnomeVFS2_FIND_QUIETLY) + message(STATUS "Found GnomeVFS2: ${GNOMEVFS2_LIBRARIES}") + endif (NOT GnomeVFS2_FIND_QUIETLY) + else (GNOMEVFS2_FOUND) + if (GnomeVFS2_FIND_REQUIRED) + message(FATAL_ERROR "Could not find GnomeVFS2") + endif (GnomeVFS2_FIND_REQUIRED) + endif (GNOMEVFS2_FOUND) + + # show the GNOMEVFS2_INCLUDE_DIRS and GNOMEVFS2_LIBRARIES variables only in the advanced view + mark_as_advanced(GNOMEVFS2_INCLUDE_DIRS GNOMEVFS2_LIBRARIES) + +endif (GNOMEVFS2_LIBRARIES AND GNOMEVFS2_INCLUDE_DIRS) + diff --git a/build/cmake/modules/FindLibNotify.cmake b/build/cmake/modules/FindLibNotify.cmake new file mode 100644 index 0000000000..e76b199ba7 --- /dev/null +++ b/build/cmake/modules/FindLibNotify.cmake @@ -0,0 +1,55 @@ +# - Try to find LibNotify +# This module defines the following variables: +# +# LIBNOTIFY_FOUND - LibNotify was found +# LIBNOTIFY_INCLUDE_DIRS - the LibNotify include directories +# LIBNOTIFY_LIBRARIES - link these to use LibNotify +# +# Copyright (C) 2012 Raphael Kubo da Costa +# Copyright (C) 2014 Collabora Ltd. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS +# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +find_package(PkgConfig) +pkg_check_modules(LIBNOTIFY QUIET libnotify) + +find_path(LIBNOTIFY_INCLUDE_DIRS + NAMES notify.h + HINTS ${LIBNOTIFY_INCLUDEDIR} + ${LIBNOTIFY_INCLUDE_DIRS} + PATH_SUFFIXES libnotify +) + +find_library(LIBNOTIFY_LIBRARIES + NAMES notify + HINTS ${LIBNOTIFY_LIBDIR} + ${LIBNOTIFY_LIBRARY_DIRS} +) + +include(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibNotify REQUIRED_VARS LIBNOTIFY_INCLUDE_DIRS LIBNOTIFY_LIBRARIES + VERSION_VAR LIBNOTIFY_VERSION) + +mark_as_advanced( + LIBNOTIFY_INCLUDE_DIRS + LIBNOTIFY_LIBRARIES +) diff --git a/build/cmake/modules/FindMSPACK.cmake b/build/cmake/modules/FindMSPACK.cmake new file mode 100644 index 0000000000..c82e8caa60 --- /dev/null +++ b/build/cmake/modules/FindMSPACK.cmake @@ -0,0 +1,40 @@ +## FindMSPACK.cmake +## +## Copyright (C) 2016 Christian Schenk +## +## This file is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; either version 2, or (at your +## option) any later version. +## +## This file is distributed in the hope that it will be useful, but +## WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this file; if not, write to the Free Software +## Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +## USA. + +find_path(MSPACK_INCLUDE_DIR + NAMES + mspack.h +) + +find_library(MSPACK_LIBRARY + NAMES + mspack +) + +find_package_handle_standard_args(MSPACK DEFAULT_MSG MSPACK_LIBRARY MSPACK_INCLUDE_DIR) + +if(MSPACK_FOUND) + set(MSPACK_INCLUDE_DIRS ${MSPACK_INCLUDE_DIR}) + set(MSPACK_LIBRARIES ${MSPACK_LIBRARY}) +else() + set(MSPACK_INCLUDE_DIRS) + set(MSPACK_LIBRARIES) +endif() + +mark_as_advanced(MSPACK_LIBRARY MSPACK_INCLUDE_DIR) diff --git a/build/cmake/modules/FindXTest.cmake b/build/cmake/modules/FindXTest.cmake new file mode 100644 index 0000000000..8fb21f682e --- /dev/null +++ b/build/cmake/modules/FindXTest.cmake @@ -0,0 +1,51 @@ +# - Find XTEST +# Find the XTEST libraries +# +# This module defines the following variables: +# XTEST_FOUND - true if XTEST_INCLUDE_DIR & XTEST_LIBRARY are found +# XTEST_LIBRARIES - Set when XTEST_LIBRARY is found +# XTEST_INCLUDE_DIRS - Set when XTEST_INCLUDE_DIR is found +# +# XTEST_INCLUDE_DIR - where to find XTest.h, etc. +# XTEST_LIBRARY - the XTEST library +# + +#============================================================================= +# Copyright 2011 O.S. Systems Software Ltda. +# Copyright 2011 Otavio Salvador +# Copyright 2011 Marc-Andre Moreau +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============================================================================= + +find_path(XTEST_INCLUDE_DIR NAMES X11/extensions/XTest.h + PATH_SUFFIXES X11/extensions + PATHS /opt/X11/include + DOC "The XTest include directory" +) + +find_library(XTEST_LIBRARY NAMES Xtst + PATHS /opt/X11/lib + DOC "The XTest library" +) + +include(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(XTest DEFAULT_MSG XTEST_LIBRARY XTEST_INCLUDE_DIR) + +if(XTEST_FOUND) + set( XTEST_LIBRARIES ${XTEST_LIBRARY} ) + set( XTEST_INCLUDE_DIRS ${XTEST_INCLUDE_DIR} ) +endif() + +mark_as_advanced(XTEST_INCLUDE_DIR XTEST_LIBRARY) + diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake index 1ea8458bda..df57e1023b 100644 --- a/build/cmake/options.cmake +++ b/build/cmake/options.cmake @@ -76,8 +76,12 @@ set(wxTHIRD_PARTY_LIBRARIES ${wxTHIRD_PARTY_LIBRARIES} wxUSE_LIBLZMA "use liblzm wx_option(wxUSE_OPENGL "use OpenGL (or Mesa)") wx_option(wxUSE_LIBSDL "use SDL for audio on Unix") -if(NOT WIN32) +if(UNIX) wx_option(wxUSE_LIBICONV "use libiconv (character conversion)") + wx_option(wxUSE_LIBNOTIFY "use libnotify for notifications") + wx_option(wxUSE_XTEST "use XTest extension") + wx_option(wxUSE_LIBMSPACK "use libmspack (CHM help files loading)") + wx_option(wxUSE_LIBGNOMEVFS "use GNOME VFS for associating MIME types") endif() # --------------------------------------------------------------------------- From b9d31dffc5e3c97c54a3569e1700506aa0c33543 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Wed, 12 Dec 2018 20:37:14 +0100 Subject: [PATCH 57/77] CMake: Improve finding Iconv Continue when Iconv can not be found. Silence warnings when testing if second argument for iconv() is const. Use correct include dir. --- build/cmake/init.cmake | 26 ++++++++++++++++++-------- build/cmake/lib/base/CMakeLists.txt | 4 ++-- build/cmake/modules/FindIconv.cmake | 2 ++ build/cmake/setup.cmake | 9 ++++----- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake index 462bb50729..9738f69859 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake @@ -154,15 +154,25 @@ if(wxUSE_LIBLZMA) find_package(LibLZMA REQUIRED) endif() -if(UNIX AND wxUSE_SECRETSTORE) - # The required APIs are always available under MSW and OS X but we must - # have GNOME libsecret under Unix to be able to compile this class. - find_package(Libsecret REQUIRED) - if(NOT LIBSECRET_FOUND) - message(WARNING "libsecret not found, wxSecretStore won't be available") - wx_option_force_value(wxUSE_SECRETSTORE OFF) +if(UNIX) + if(wxUSE_SECRETSTORE) + # The required APIs are always available under MSW and OS X but we must + # have GNOME libsecret under Unix to be able to compile this class. + find_package(Libsecret REQUIRED) + if(NOT LIBSECRET_FOUND) + message(WARNING "libsecret not found, wxSecretStore won't be available") + wx_option_force_value(wxUSE_SECRETSTORE OFF) + endif() endif() -endif() + + if(wxUSE_LIBICONV) + find_package(Iconv) + if(NOT ICONV_FOUND) + message(WARNING "iconv not found") + wx_option_force_value(wxUSE_LIBICONV OFF) + endif() + endif() +endif(UNIX) if(wxUSE_GUI) if(WXMSW AND wxUSE_METAFILE) diff --git a/build/cmake/lib/base/CMakeLists.txt b/build/cmake/lib/base/CMakeLists.txt index 8f526afebe..08a1f74f22 100644 --- a/build/cmake/lib/base/CMakeLists.txt +++ b/build/cmake/lib/base/CMakeLists.txt @@ -48,8 +48,8 @@ if(UNIX AND wxUSE_SECRETSTORE) wx_lib_include_directories(base PRIVATE ${LIBSECRET_INCLUDE_DIRS}) wx_lib_link_libraries(base PRIVATE ${LIBSECRET_LIBRARIES}) endif() -if(wxUSE_LIBICONV AND ICONV_FOUND) - wx_lib_include_directories(base PRIVATE ${ICONV_INCLUDE_DIRS}) +if(wxUSE_LIBICONV) + wx_lib_include_directories(base PRIVATE ${ICONV_INCLUDE_DIR}) wx_lib_link_libraries(base PRIVATE ${ICONV_LIBRARIES}) endif() if(wxUSE_THREADS AND CMAKE_THREAD_LIBS_INIT) diff --git a/build/cmake/modules/FindIconv.cmake b/build/cmake/modules/FindIconv.cmake index 79e4b34f37..9d95da030b 100644 --- a/build/cmake/modules/FindIconv.cmake +++ b/build/cmake/modules/FindIconv.cmake @@ -25,6 +25,7 @@ ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR}) set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES}) +set(CMAKE_REQUIRED_QUIET ON) IF(ICONV_FOUND) check_cxx_source_compiles(" #include @@ -41,6 +42,7 @@ IF(ICONV_FOUND) ENDIF(ICONV_FOUND) set(CMAKE_REQUIRED_INCLUDES) set(CMAKE_REQUIRED_LIBRARIES) +set(CMAKE_REQUIRED_QUIET) IF(ICONV_FOUND) IF(NOT ICONV_FIND_QUIETLY) diff --git a/build/cmake/setup.cmake b/build/cmake/setup.cmake index c3d66de91e..a102731af9 100644 --- a/build/cmake/setup.cmake +++ b/build/cmake/setup.cmake @@ -217,9 +217,8 @@ macro(wx_get_socket_param_type name code) endmacro() # the following tests are for Unix(like) systems only -if(NOT WIN32) - if(wxUSE_LIBICONV AND NOT APPLE) - find_package(Iconv REQUIRED) +if(UNIX) + if(wxUSE_LIBICONV) set(HAVE_ICONV ON) set(ICONV_CONST " ") if(ICONV_SECOND_ARGUMENT_IS_CONST) @@ -419,8 +418,8 @@ if(NOT WIN32) check_symbol_exists(getservbyname netdb.h HAVE_GETSERVBYNAME) check_symbol_exists(inet_aton arpa/inet.h HAVE_INET_ATON) check_symbol_exists(inet_addr arpa/inet.h HAVE_INET_ADDR) - endif() # wxUSE_SOCKETS -endif() # NOT WIN32 + endif(wxUSE_SOCKETS) +endif(UNIX) if(CMAKE_USE_PTHREADS_INIT) cmake_push_check_state(RESET) From 042b17512ec222cf597692c042b33dfdf697e797 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Wed, 12 Dec 2018 20:38:32 +0100 Subject: [PATCH 58/77] CMake: Check for libSDL only on Unix --- build/cmake/lib/core/CMakeLists.txt | 2 +- build/cmake/options.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/cmake/lib/core/CMakeLists.txt b/build/cmake/lib/core/CMakeLists.txt index 439b4c567b..e991c3d3e3 100644 --- a/build/cmake/lib/core/CMakeLists.txt +++ b/build/cmake/lib/core/CMakeLists.txt @@ -77,7 +77,7 @@ if(WXGTK AND wxUSE_PRIVATE_FONTS) wx_lib_include_directories(core PUBLIC ${FONTCONFIG_INCLUDE_DIR}) wx_lib_link_libraries(core PUBLIC ${FONTCONFIG_LIBRARIES}) endif() -if(UNIX AND wxUSE_LIBSDL) +if(wxUSE_LIBSDL) if(SDL2_FOUND) wx_lib_include_directories(core PUBLIC ${SDL2_INCLUDE_DIR}) wx_lib_link_libraries(core PUBLIC ${SDL2_LIBRARY}) diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake index df57e1023b..948e1fa414 100644 --- a/build/cmake/options.cmake +++ b/build/cmake/options.cmake @@ -74,9 +74,9 @@ wx_option(wxUSE_LIBLZMA "use LZMA compression" OFF) set(wxTHIRD_PARTY_LIBRARIES ${wxTHIRD_PARTY_LIBRARIES} wxUSE_LIBLZMA "use liblzma for LZMA compression") wx_option(wxUSE_OPENGL "use OpenGL (or Mesa)") -wx_option(wxUSE_LIBSDL "use SDL for audio on Unix") if(UNIX) + wx_option(wxUSE_LIBSDL "use SDL for audio on Unix") wx_option(wxUSE_LIBICONV "use libiconv (character conversion)") wx_option(wxUSE_LIBNOTIFY "use libnotify for notifications") wx_option(wxUSE_XTEST "use XTest extension") From 91b6305dcd057faaa922e8ed645b732410ce2a92 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Wed, 12 Dec 2018 20:41:37 +0100 Subject: [PATCH 59/77] CMake: Improve checking for external libraries Do not abort when libLZMA or libSecret can not be found, just show a warning. Do not search for libSecret on macOS. Disable libraries internally (not in cache) when not searching for them. --- build/cmake/init.cmake | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake index 9738f69859..2d67e48c90 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake @@ -151,14 +151,18 @@ if(wxUSE_THREADS) endif() if(wxUSE_LIBLZMA) - find_package(LibLZMA REQUIRED) + find_package(LibLZMA) + if(NOT LIBLZMA_FOUND) + message(WARNING "libLZMA not found, LZMA compression won't be available") + wx_option_force_value(wxUSE_LIBLZMA OFF) + endif() endif() if(UNIX) - if(wxUSE_SECRETSTORE) + if(wxUSE_SECRETSTORE AND NOT APPLE) # The required APIs are always available under MSW and OS X but we must # have GNOME libsecret under Unix to be able to compile this class. - find_package(Libsecret REQUIRED) + find_package(Libsecret) if(NOT LIBSECRET_FOUND) message(WARNING "libsecret not found, wxSecretStore won't be available") wx_option_force_value(wxUSE_SECRETSTORE OFF) @@ -293,9 +297,12 @@ if(wxUSE_GUI) message(WARNING "GStreamer not found, wxMediaCtrl won't be available") wx_option_force_value(wxUSE_MEDIACTRL OFF) endif() + else() + set(wxUSE_GSTREAMER OFF) + set(wxUSE_GSTREAMER_PLAYER OFF) endif() - if(UNIX AND wxUSE_LIBSDL) + if(wxUSE_SOUND AND UNIX AND wxUSE_LIBSDL) find_package(SDL2) if(NOT SDL2_FOUND) find_package(SDL) @@ -304,6 +311,8 @@ if(wxUSE_GUI) message(WARNING "SDL not found, SDL Audio back-end won't be available") wx_option_force_value(wxUSE_LIBSDL OFF) endif() + else() + set(wxUSE_LIBSDL OFF) endif() if(wxUSE_NOTIFICATION_MESSAGE AND UNIX AND WXGTK2 AND wxUSE_LIBNOTIFY) @@ -314,6 +323,8 @@ if(wxUSE_GUI) elseif((LIBNOTIFY_VERSION GREATER 0.7) OR (LIBNOTIFY_VERSION EQUAL 0.7)) set(wxUSE_LIBNOTIFY_0_7 ON) endif() + else() + set(wxUSE_LIBNOTIFY OFF) endif() if(wxUSE_UIACTIONSIMULATOR AND UNIX AND WXGTK) @@ -346,6 +357,8 @@ if(wxUSE_GUI) message(STATUS "libmspack not found") wx_option_force_value(wxUSE_LIBMSPACK OFF) endif() + else() + set(wxUSE_LIBMSPACK OFF) endif() if(WXGTK2 AND wxUSE_MIMETYPE AND wxUSE_LIBGNOMEVFS) @@ -357,5 +370,7 @@ if(wxUSE_GUI) message(STATUS "libgnomevfs not found, library won't be used to associate MIME type") wx_option_force_value(wxUSE_LIBGNOMEVFS OFF) endif() + else() + set(wxUSE_LIBGNOMEVFS OFF) endif() endif() From 5348b4fa3b4b91e7fedbbe42cc95fc862b081153 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Wed, 12 Dec 2018 20:43:17 +0100 Subject: [PATCH 60/77] CMake: Improve layout of third party libraries summary Add more external libraries to the summary, like configure does. --- build/cmake/functions.cmake | 32 ++++++++++++++++++++++++++------ build/cmake/options.cmake | 4 ++++ 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake index dfab1ccc95..6e0e528c0d 100644 --- a/build/cmake/functions.cmake +++ b/build/cmake/functions.cmake @@ -524,16 +524,36 @@ function(wx_add_thirdparty_library var_name lib_name help_str) endfunction() function(wx_print_thirdparty_library_summary) + set(nameLength 0) + set(nameValLength 0) set(var_name) - set(message "Which libraries should wxWidgets use?\n") - foreach(entry IN - LISTS wxTHIRD_PARTY_LIBRARIES - ITEMS wxUSE_STL "Use C++ STL classes") - + foreach(entry IN LISTS wxTHIRD_PARTY_LIBRARIES) if(NOT var_name) set(var_name ${entry}) else() - wx_string_append(message " ${var_name}: ${${var_name}} (${entry})\n") + string(LENGTH ${var_name} len) + if(len GREATER nameLength) + set(nameLength ${len}) + endif() + string(LENGTH ${${var_name}} len) + if(len GREATER nameValLength) + set(nameValLength ${len}) + endif() + set(var_name) + endif() + endforeach() + math(EXPR nameLength "${nameLength}+1") # account for : + + set(message "Which libraries should wxWidgets use?\n") + foreach(entry IN LISTS wxTHIRD_PARTY_LIBRARIES) + if(NOT var_name) + set(var_name ${entry}) + else() + set(namestr "${var_name}: ") + set(nameval "${${var_name}} ") + string(SUBSTRING ${namestr} 0 ${nameLength} namestr) + string(SUBSTRING ${nameval} 0 ${nameValLength} nameval) + wx_string_append(message " ${namestr} ${nameval} (${entry})\n") set(var_name) endif() endforeach() diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake index 948e1fa414..3a2a13d42a 100644 --- a/build/cmake/options.cmake +++ b/build/cmake/options.cmake @@ -46,6 +46,7 @@ endif() # STL options wx_option(wxUSE_STL "use standard C++ classes for everything" OFF) +set(wxTHIRD_PARTY_LIBRARIES ${wxTHIRD_PARTY_LIBRARIES} wxUSE_STL "use C++ STL classes") wx_dependent_option(wxUSE_STD_CONTAINERS "use standard C++ container classes" ON "wxUSE_STL" OFF) wx_option(wxUSE_UNICODE "compile with Unicode support (NOT RECOMMENDED to be turned off)") @@ -82,6 +83,9 @@ if(UNIX) wx_option(wxUSE_XTEST "use XTest extension") wx_option(wxUSE_LIBMSPACK "use libmspack (CHM help files loading)") wx_option(wxUSE_LIBGNOMEVFS "use GNOME VFS for associating MIME types") + + set(wxTHIRD_PARTY_LIBRARIES ${wxTHIRD_PARTY_LIBRARIES} wxUSE_LIBSDL "use SDL for audio on Unix") + set(wxTHIRD_PARTY_LIBRARIES ${wxTHIRD_PARTY_LIBRARIES} wxUSE_LIBMSPACK "use libmspack (CHM help files loading)") endif() # --------------------------------------------------------------------------- From c1013d9bfcd0bf826d91fded00d7b682bbe9a63b Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Wed, 12 Dec 2018 20:43:50 +0100 Subject: [PATCH 61/77] CMake: Add more option validity checks --- build/cmake/init.cmake | 57 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake index 2d67e48c90..cbbdb81dbf 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake @@ -134,9 +134,6 @@ if(NOT wxUSE_EXPAT) set(wxUSE_XRC OFF) endif() set(wxUSE_XML ${wxUSE_XRC}) -if(wxUSE_CONFIG) - set(wxUSE_CONFIG_NATIVE ON) -endif() if(DEFINED wxUSE_OLE AND wxUSE_OLE) set(wxUSE_OLE_AUTOMATION ON) @@ -146,6 +143,60 @@ if(wxUSE_OPENGL) set(wxUSE_GLCANVAS ON) endif() +if(wxUSE_ARCHIVE_STREAMS AND NOT wxUSE_STREAMS) + message(WARNING "wxArchive requires wxStreams... disabled") + wx_option_force_value(wxUSE_ARCHIVE_STREAMS OFF) +endif() + +if(wxUSE_ZIPSTREAM AND (NOT wxUSE_ARCHIVE_STREAMS OR NOT wxUSE_ZLIB)) + message(WARNING "wxZip requires wxArchive or wxZlib... disabled") + wx_option_force_value(wxUSE_ZIPSTREAM OFF) +endif() + +if(wxUSE_TARSTREAM AND NOT wxUSE_ARCHIVE_STREAMS) + message(WARNING "wxTar requires wxArchive... disabled") + wx_option_force_value(wxUSE_TARSTREAM OFF) +endif() + +if(wxUSE_FILESYSTEM AND (NOT wxUSE_STREAMS OR (NOT wxUSE_FILE AND NOT wxUSE_FFILE))) + message(WARNING "wxFileSystem requires wxStreams and wxFile or wxFFile... disabled") + wx_option_force_value(wxUSE_FILESYSTEM OFF) +endif() + +if(wxUSE_FS_ARCHIVE AND (NOT wxUSE_FILESYSTEM OR NOT wxUSE_ARCHIVE_STREAMS)) + message(WARNING "wxArchiveFSHandler requires wxArchive and wxFileSystem... disabled") + wx_option_force_value(wxUSE_FS_ARCHIVE OFF) +endif() + +if(wxUSE_FS_ARCHIVE AND (NOT wxUSE_FILESYSTEM OR NOT wxUSE_ARCHIVE_STREAMS)) + message(WARNING "wxArchiveFSHandler requires wxArchive and wxFileSystem... disabled") + wx_option_force_value(wxUSE_FS_ARCHIVE OFF) +endif() + +if(wxUSE_FS_ZIP AND NOT wxUSE_FS_ARCHIVE) + message(WARNING "wxZipFSHandler requires wxArchiveFSHandler... disabled") + wx_option_force_value(wxUSE_FS_ZIP OFF) +endif() + +if(wxUSE_TEXTFILE AND (NOT wxUSE_FILE OR NOT wxUSE_TEXTBUFFER)) + message(WARNING "wxTextFile requires wxFile and wxTextBuffer... disabled") + wx_option_force_value(wxUSE_TEXTFILE OFF) +endif() + +if(wxUSE_CONFIG) + if(NOT wxUSE_TEXTFILE) + message(WARNING "wxConfig requires wxTextFile... disabled") + wx_option_force_value(wxUSE_CONFIG OFF) + else() + set(wxUSE_CONFIG_NATIVE ON) + endif() +endif() + +if(wxUSE_INTL AND NOT wxUSE_FILE) + message(WARNING "I18n code requires wxFile... disabled") + wx_option_force_value(wxUSE_INTL OFF) +endif() + if(wxUSE_THREADS) find_package(Threads REQUIRED) endif() From 141f0cb0e452293bc1df91a780e34d0b92bc34c1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 12 Dec 2018 23:45:09 +0100 Subject: [PATCH 62/77] Suppress harmless gcc missing initializers warnings in a test Suppressing the warnings is ugly but less ugly than explicitly specifying all the omitted elements in the array. --- tests/sizers/boxsizer.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/sizers/boxsizer.cpp b/tests/sizers/boxsizer.cpp index 77c33cc9fb..2033e1f344 100644 --- a/tests/sizers/boxsizer.cpp +++ b/tests/sizers/boxsizer.cpp @@ -130,6 +130,8 @@ void BoxSizerTestCase::Size1() void BoxSizerTestCase::Size3() { + wxGCC_WARNING_SUPPRESS(missing-field-initializers) + // check that various combinations of minimal sizes and proportions work as // expected for different window sizes static const struct LayoutTestData @@ -189,6 +191,8 @@ void BoxSizerTestCase::Size3() { { 1, 2, 3, }, { 100, 100, 100, }, 0, { 0, 0, 0, }, true }, }; + wxGCC_WARNING_RESTORE(missing-field-initializers) + wxWindow *child[3]; child[0] = new wxWindow(m_win, wxID_ANY); child[1] = new wxWindow(m_win, wxID_ANY); From c95f668b217720372b9d448d5b12520c8fca7337 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 13 Dec 2018 00:39:25 +0100 Subject: [PATCH 63/77] Fix use of dangling pointer in ButtonTestCase::Disabled() Fix the test added in dfec7aa0c08617ed61fc1ee04551aea19dc6abd0 which deleted the button pointer used by EventCounter by simply moving EventCounter initialization after the button re-creation. See #16385. --- tests/controls/buttontest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/controls/buttontest.cpp b/tests/controls/buttontest.cpp index 4f84523828..ffc4480f8c 100644 --- a/tests/controls/buttontest.cpp +++ b/tests/controls/buttontest.cpp @@ -98,8 +98,6 @@ void ButtonTestCase::Click() void ButtonTestCase::Disabled() { - EventCounter clicked(m_button, wxEVT_BUTTON); - wxUIActionSimulator sim; // In this test we disable the button and check events are not sent and we @@ -118,6 +116,8 @@ void ButtonTestCase::Disabled() m_button->Create(wxTheApp->GetTopWindow(), wxID_ANY, "wxButton"); } + EventCounter clicked(m_button, wxEVT_BUTTON); + sim.MouseMove(m_button->GetScreenPosition() + wxPoint(10, 10)); wxYield(); From b9fe8ca10c17c221020539bc5b337a33342afbf4 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 12 Dec 2018 22:23:16 +0100 Subject: [PATCH 64/77] Try to use pkg-config for detecting libtiff in configure This is more reliable than checking whether we can link with the library manually and may work even if it's installed in a non-standard location. It also allows the user to specify PKG_CONFIG_PATH='pkg-config --static' when running configure to link with all transitional dependencies when linking statically. Closes https://github.com/wxWidgets/wxWidgets/pull/1073 See #18293. --- configure | 180 +++++++++++++++++++++++++++++++++++++++++++++++---- configure.in | 62 +++++++++++------- 2 files changed, 203 insertions(+), 39 deletions(-) diff --git a/configure b/configure index 031ff5c97b..f7dd626d22 100755 --- a/configure +++ b/configure @@ -977,6 +977,8 @@ GTK_CONFIG GTK_LIBS GTK_CFLAGS subdirs +LIBTIFF_LIBS +LIBTIFF_CFLAGS PKG_CONFIG AR HAVE_CXX17 @@ -1364,6 +1366,8 @@ CXX CXXFLAGS CCC PKG_CONFIG +LIBTIFF_CFLAGS +LIBTIFF_LIBS DIRECTFB_CFLAGS DIRECTFB_LIBS XMKMF @@ -2349,6 +2353,10 @@ Some influential environment variables: CXX C++ compiler command CXXFLAGS C++ compiler flags PKG_CONFIG path to pkg-config utility + LIBTIFF_CFLAGS + C compiler flags for LIBTIFF, overriding pkg-config + LIBTIFF_LIBS + linker flags for LIBTIFF, overriding pkg-config DIRECTFB_CFLAGS C compiler flags for DIRECTFB, overriding pkg-config DIRECTFB_LIBS @@ -23429,30 +23437,94 @@ fi TIFF_LINK= -TIFF_PREREQ_LINKS=-lm if test "$wxUSE_LIBTIFF" != "no" ; then $as_echo "#define wxUSE_LIBTIFF 1" >>confdefs.h if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then - if test "$wxUSE_LIBJPEG" = "sys"; then - TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK" + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBTIFF" >&5 +$as_echo_n "checking for LIBTIFF... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$LIBTIFF_CFLAGS"; then + pkg_cv_LIBTIFF_CFLAGS="$LIBTIFF_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtiff-4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libtiff-4") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBTIFF_CFLAGS=`$PKG_CONFIG --cflags "libtiff-4" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$LIBTIFF_LIBS"; then + pkg_cv_LIBTIFF_LIBS="$LIBTIFF_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtiff-4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libtiff-4") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBTIFF_LIBS=`$PKG_CONFIG --libs "libtiff-4" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + LIBTIFF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libtiff-4"` + else + LIBTIFF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libtiff-4"` fi - if test "$wxUSE_ZLIB" = "sys"; then - TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK" - fi - if test -n "$LZMA_LINK"; then - TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $LZMA_LINK" - fi - if test "$wxUSE_LIBJBIG" = "yes"; then - TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JBIG_LINK" - fi - ac_fn_c_check_header_compile "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" " + # Put the nasty error message in config.log where it belongs + echo "$LIBTIFF_PKG_ERRORS" >&5 + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found via pkg-config" >&5 +$as_echo "not found via pkg-config" >&6; } + + TIFF_PREREQ_LINKS=-lm + + if test "$wxUSE_LIBJPEG" = "sys"; then + TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK" + fi + if test "$wxUSE_ZLIB" = "sys"; then + TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK" + fi + if test -n "$LZMA_LINK"; then + TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $LZMA_LINK" + fi + if test "$wxUSE_LIBJBIG" = "yes"; then + TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JBIG_LINK" + fi + ac_fn_c_check_header_compile "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" " " if test "x$ac_cv_header_tiffio_h" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFError in -ltiff" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFError in -ltiff" >&5 $as_echo_n "checking for TIFFError in -ltiff... " >&6; } if ${ac_cv_lib_tiff_TIFFError+:} false; then : $as_echo_n "(cached) " >&6 @@ -23497,6 +23569,86 @@ fi +elif test $pkg_failed = untried; then + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found via pkg-config" >&5 +$as_echo "not found via pkg-config" >&6; } + + TIFF_PREREQ_LINKS=-lm + + if test "$wxUSE_LIBJPEG" = "sys"; then + TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK" + fi + if test "$wxUSE_ZLIB" = "sys"; then + TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK" + fi + if test -n "$LZMA_LINK"; then + TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $LZMA_LINK" + fi + if test "$wxUSE_LIBJBIG" = "yes"; then + TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JBIG_LINK" + fi + ac_fn_c_check_header_compile "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" " + +" +if test "x$ac_cv_header_tiffio_h" = xyes; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFError in -ltiff" >&5 +$as_echo_n "checking for TIFFError in -ltiff... " >&6; } +if ${ac_cv_lib_tiff_TIFFError+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ltiff $TIFF_PREREQ_LINKS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char TIFFError (); +int +main () +{ +return TIFFError (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_tiff_TIFFError=yes +else + ac_cv_lib_tiff_TIFFError=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFError" >&5 +$as_echo "$ac_cv_lib_tiff_TIFFError" >&6; } +if test "x$ac_cv_lib_tiff_TIFFError" = xyes; then : + TIFF_LINK=" -ltiff" +fi + + +fi + + + +else + LIBTIFF_CFLAGS=$pkg_cv_LIBTIFF_CFLAGS + LIBTIFF_LIBS=$pkg_cv_LIBTIFF_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + TIFF_LINK=$LIBTIFF_LIBS + CFLAGS="$LIBTIFF_CFLAGS $CFLAGS" + +fi + if test "x$TIFF_LINK" = "x" ; then if test "$wxUSE_LIBTIFF" = "sys" ; then as_fn_error $? "system tiff library not found! Use --with-libtiff=builtin to use built-in version" "$LINENO" 5 diff --git a/configure.in b/configure.in index b2aadfa781..4b427d1804 100644 --- a/configure.in +++ b/configure.in @@ -2612,35 +2612,47 @@ dnl Check for tiff library dnl ------------------------------------------------------------------------ TIFF_LINK= -TIFF_PREREQ_LINKS=-lm if test "$wxUSE_LIBTIFF" != "no" ; then AC_DEFINE(wxUSE_LIBTIFF) if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then - dnl libtiff may depend on libjpeg and libz so use them in the test - dnl below or it would fail - if test "$wxUSE_LIBJPEG" = "sys"; then - TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK" - fi - if test "$wxUSE_ZLIB" = "sys"; then - TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK" - fi - if test -n "$LZMA_LINK"; then - TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $LZMA_LINK" - fi - if test "$wxUSE_LIBJBIG" = "yes"; then - TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JBIG_LINK" - fi - AC_CHECK_HEADER(tiffio.h, - [ - AC_CHECK_LIB(tiff, TIFFError, - TIFF_LINK=" -ltiff", - , - $TIFF_PREREQ_LINKS) - ], - [], - [ ] - ) + dnl First try using pkg-config as it's the most reliable way to detect + dnl libtiff. + PKG_CHECK_MODULES(LIBTIFF, [libtiff-4], + [ + TIFF_LINK=$LIBTIFF_LIBS + CFLAGS="$LIBTIFF_CFLAGS $CFLAGS" + ], + [ + AC_MSG_RESULT([not found via pkg-config]) + + TIFF_PREREQ_LINKS=-lm + + dnl libtiff may depend on libjpeg and libz so use them in the test + dnl below or it would fail + if test "$wxUSE_LIBJPEG" = "sys"; then + TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK" + fi + if test "$wxUSE_ZLIB" = "sys"; then + TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK" + fi + if test -n "$LZMA_LINK"; then + TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $LZMA_LINK" + fi + if test "$wxUSE_LIBJBIG" = "yes"; then + TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JBIG_LINK" + fi + AC_CHECK_HEADER(tiffio.h, + [ + AC_CHECK_LIB(tiff, TIFFError, + TIFF_LINK=" -ltiff", + , + $TIFF_PREREQ_LINKS) + ], + [], + [ ] + ) + ]) if test "x$TIFF_LINK" = "x" ; then if test "$wxUSE_LIBTIFF" = "sys" ; then From 5189781072cb5e360b7e1937b4187191351515b9 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 13 Dec 2018 15:09:13 +0100 Subject: [PATCH 65/77] Move wxDataViewCtrl incompatibility note to the correct section 3a24beca62c1130b887bb53ef40de5076a11e257 added this in a wrong place, as this change does not result in any build errors. See #18295. --- docs/changes.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index ba32a67731..fc7fcb1e00 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -59,6 +59,9 @@ Changes in behaviour not resulting in compilation errors return just "N" under Linux and macOS. Use the new GetButtonOrdinal() to update the existing code if necessary. +- Generic wxDataViewCtrl now always resizes its last column to fill all the + available space, as the GTK+ version always did. + Changes in behaviour which may result in build errors ----------------------------------------------------- @@ -94,9 +97,6 @@ Changes in behaviour which may result in build errors not long. Its return value hasn't changed, however, and is still always either true or false, so normally the existing code should continue to work. -- Generic wxDataViewCtrl now always resizes its last column to fill all the - available space, as the GTK+ version always did. - - configure only accepts the options it knows about now and doesn't silently ignore all the rest. If you get errors about unknown options, you may either specify --disable-option-checking argument to continue accepting them (which From 89e4ee1ec0070d4db45cf2d4928b2c270493e22c Mon Sep 17 00:00:00 2001 From: chris2oph Date: Fri, 7 Dec 2018 11:18:53 +0000 Subject: [PATCH 66/77] Ensure items are sorted when added to wxChoice in wxQt Call sort() to resort the model after inserting a new item. Closes https://github.com/wxWidgets/wxWidgets/pull/1054 --- src/qt/choice.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qt/choice.cpp b/src/qt/choice.cpp index 19d074284a..02101b7562 100644 --- a/src/qt/choice.cpp +++ b/src/qt/choice.cpp @@ -148,6 +148,10 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items, int wxChoice::DoInsertOneItem(const wxString& item, unsigned int pos) { m_qtComboBox->insertItem(pos, wxQtConvertString(item)); + + if ( IsSorted() ) + m_qtComboBox->model()->sort(0); + return pos; } From 013c6a6b6a5a645d3f918cd6bdfdc3e6b4c93b8f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 13 Dec 2018 15:17:18 +0100 Subject: [PATCH 67/77] Speed up inserting many items in sorted wxChoice in wxQt Only sort the combobox once instead of doing it for every item. See https://github.com/wxWidgets/wxWidgets/pull/1054 --- src/qt/choice.cpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/qt/choice.cpp b/src/qt/choice.cpp index 02101b7562..2716a9c004 100644 --- a/src/qt/choice.cpp +++ b/src/qt/choice.cpp @@ -141,7 +141,28 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items, wxClientDataType type) { InvalidateBestSize(); + + // Hack: to avoid resorting the model many times in DoInsertOneItem(), + // which will be called for each item from DoInsertItemsInLoop(), reset the + // wxCB_SORT style if we have it temporarily and only sort once at the end. + bool wasSorted = false; + if ( IsSorted() ) + { + wasSorted = true; + ToggleWindowStyle(wxCB_SORT); + } + int n = DoInsertItemsInLoop(items, pos, clientData, type); + + if ( wasSorted ) + { + // Restore the flag turned off above. + ToggleWindowStyle(wxCB_SORT); + + // And actually sort items now. + m_qtComboBox->model()->sort(0); + } + return n; } From db15e9988474840e9518c7d2a8f70648add5f370 Mon Sep 17 00:00:00 2001 From: Graham Dawes Date: Wed, 12 Dec 2018 09:03:10 +0000 Subject: [PATCH 68/77] Fix wxBitmap::GetRawData() in wxQt This method used to return a dangling pointer to a temporary buffer, which resulted in a crash when using it, e.g. in the unit test. Fix this by keeping a QImage as a member in wxBitmapRefData, so that the pointer to its data remain valid until UngetRawData() is called. Also check that GetRawData() returns a non-null pointer in the test. Closes https://github.com/wxWidgets/wxWidgets/pull/1067 --- src/qt/bitmap.cpp | 25 +++++++++++++++---------- tests/graphics/bitmap.cpp | 1 + 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/qt/bitmap.cpp b/src/qt/bitmap.cpp index 6f632a1931..31f1380c06 100644 --- a/src/qt/bitmap.cpp +++ b/src/qt/bitmap.cpp @@ -144,6 +144,7 @@ class wxBitmapRefData: public wxGDIRefData virtual ~wxBitmapRefData() { delete m_mask; } QPixmap m_qtPixmap; + QImage m_rawPixelSource; wxMask *m_mask; private: @@ -409,17 +410,19 @@ void wxBitmap::SetDepth(int depth) void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp) { void* bits = NULL; - // allow access if bpp is valid and matches existence of alpha - if ( !M_PIXDATA.isNull() ) + + wxBitmapRefData *refData = static_cast(m_refData); + + // allow access if bpp is valid + if ( !refData->m_qtPixmap.isNull() ) { - QImage qimage = M_PIXDATA.toImage(); - bool hasAlpha = M_PIXDATA.hasAlphaChannel(); - if ((bpp == 24 && !hasAlpha) || (bpp == 32 && hasAlpha)) + if ( bpp == 32 ) { - data.m_height = qimage.height(); - data.m_width = qimage.width(); - data.m_stride = qimage.bytesPerLine(); - bits = (void*) qimage.bits(); + refData->m_rawPixelSource = refData->m_qtPixmap.toImage().convertToFormat(QImage::Format_RGBA8888); + data.m_height = refData->m_rawPixelSource.height(); + data.m_width = refData->m_rawPixelSource.width(); + data.m_stride = refData->m_rawPixelSource.bytesPerLine(); + bits = refData->m_rawPixelSource.bits(); } } return bits; @@ -427,7 +430,9 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp) void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(data)) { - wxMISSING_IMPLEMENTATION( __FUNCTION__ ); + wxBitmapRefData *refData = static_cast(m_refData); + refData->m_qtPixmap = QPixmap::fromImage(refData->m_rawPixelSource); + refData->m_rawPixelSource = QImage(); } QPixmap *wxBitmap::GetHandle() const diff --git a/tests/graphics/bitmap.cpp b/tests/graphics/bitmap.cpp index a93062e157..b07f348b08 100644 --- a/tests/graphics/bitmap.cpp +++ b/tests/graphics/bitmap.cpp @@ -126,6 +126,7 @@ void BitmapTestCase::OverlappingBlit() if ( m_bmp.GetDepth() == 32 ) { wxAlphaPixelData npd( m_bmp ); + CPPUNIT_ASSERT_MESSAGE( "Expected raw pixels to not be NULL", npd ); wxAlphaPixelData::Iterator it( npd ); ASSERT_EQUAL_RGB( it, 255, 0, 0 ); From 8fa32a40a97f7b01fc24d81db21a0a77cdf7b3d3 Mon Sep 17 00:00:00 2001 From: Graham Dawes Date: Fri, 14 Dec 2018 10:12:35 +0000 Subject: [PATCH 69/77] Fix m_qtPainter not being initialised in wxCairoContext ctor For some reason one of the overloads of the c'tor left the m_qtPainter field set to NULL rather than asking the wxDC for it's painter. The rest of the class assumes the painter is not NULL. Closes https://github.com/wxWidgets/wxWidgets/pull/1075 --- src/generic/graphicc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp index a610eabf64..d98e68756a 100644 --- a/src/generic/graphicc.cpp +++ b/src/generic/graphicc.cpp @@ -1869,7 +1869,7 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& #endif #ifdef __WXQT__ - m_qtPainter = (QPainter*) dc.GetHandle(); + m_qtPainter = static_cast(dc.GetHandle()); // create a internal buffer (fallback if cairo_qt_surface is missing) m_qtImage = new QImage(width, height, QImage::Format_ARGB32_Premultiplied); // clear the buffer to be painted over the current contents @@ -2084,7 +2084,7 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC& #endif #ifdef __WXQT__ - m_qtPainter = NULL; + m_qtPainter = static_cast(dc.GetHandle()); // create a internal buffer (fallback if cairo_qt_surface is missing) m_qtImage = new QImage(width, height, QImage::Format_ARGB32_Premultiplied); // clear the buffer to be painted over the current contents From 5b2e99294709899b8e6b0f05b62e062a40688b69 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 16 Dec 2018 00:02:07 +0100 Subject: [PATCH 70/77] Document wxThread::Delete() behaviour more precisely Delete() doesn't (and can't, under Unix) wait for the detached threads, although it does do it under MSW (but arguably shouldn't), so it can't retrieve the thread exit code there. Document that its "rc" argument is only useful with joinable threads. Closes #18240. --- interface/wx/thread.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/interface/wx/thread.h b/interface/wx/thread.h index f308327a29..c9ba40baf3 100644 --- a/interface/wx/thread.h +++ b/interface/wx/thread.h @@ -1042,11 +1042,19 @@ public: wxThreadError Create(unsigned int stackSize = 0); /** - Calling Delete() gracefully terminates a @b detached thread, either when - the thread calls TestDestroy() or when it finishes processing. + Calling Delete() requests termination of any thread. + + Note that Delete() doesn't actually stop the thread, but simply asks it + to terminate and so will work only if the thread calls TestDestroy() + periodically. For detached threads, Delete() returns immediately, + without waiting for the thread to actually terminate, while for + joinable threads it does wait for the thread to terminate and may also + return its exit code in @a rc argument. @param rc - The thread exit code, if rc is not NULL. + For joinable threads, filled with the thread exit code on + successful return, if non-@NULL. For detached threads this + parameter is not used. @param waitMode As described in wxThreadWait documentation, wxTHREAD_WAIT_BLOCK From 50e098437d3e56050af729dfafc5724ca255c3fb Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 17 Dec 2018 14:07:12 +0100 Subject: [PATCH 71/77] Document lack of custom editors in Mac wxDataViewCtrl wxDataViewCustomRenderer::CreateEditorCtrl() is currently never called there. --- interface/wx/dataview.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h index 00a8069f06..b0ca7f6f0e 100644 --- a/interface/wx/dataview.h +++ b/interface/wx/dataview.h @@ -2551,6 +2551,10 @@ public: } @endcode + @note Currently support for this method is not implemented in the + native macOS version of the control, i.e. it will be never called + there. + @see ActivateCell() */ virtual wxWindow* CreateEditorCtrl(wxWindow* parent, From b0eca3bdde4984d41183f498e34d4c616c23f4d2 Mon Sep 17 00:00:00 2001 From: Graham Dawes Date: Mon, 17 Dec 2018 15:22:38 +0000 Subject: [PATCH 72/77] Fix some more uninitialised wxCairoContext fields in wxQt Closes https://github.com/wxWidgets/wxWidgets/pull/1084 --- src/generic/graphicc.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp index d98e68756a..a8876075ef 100644 --- a/src/generic/graphicc.cpp +++ b/src/generic/graphicc.cpp @@ -2234,6 +2234,11 @@ wxCairoContext::wxCairoContext(wxGraphicsRenderer* renderer, HWND hWnd) wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, cairo_t *context ) : wxGraphicsContext(renderer) { +#ifdef __WXQT__ + m_qtPainter = NULL; + m_qtImage = NULL; + m_qtSurface = NULL; +#endif #ifdef __WXMSW__ m_mswSurface = NULL; m_mswStateSavedDC = 0; @@ -2288,6 +2293,11 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, wxWindow *window) wxCairoContext::wxCairoContext(wxGraphicsRenderer* renderer) : wxGraphicsContext(renderer) { +#ifdef __WXQT__ + m_qtPainter = NULL; + m_qtImage = NULL; + m_qtSurface = NULL; +#endif #ifdef __WXMSW__ m_mswSurface = NULL; m_mswStateSavedDC = 0; From 14e905858d0c30b03914457f9fb5c49173366cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20S=C5=82odkowicz?= Date: Mon, 17 Dec 2018 02:39:06 +0100 Subject: [PATCH 73/77] Fix regression in wxTranslations::AddCatalog() Do load the catalog corresponding to the language of "msgid" strings in the source code, only skip the languages strictly less preferred than it. This avoids incompatibilities with pre-3.1.2 behaviour and avoids breaking existing applications relying on the old behaviour. Closes https://github.com/wxWidgets/wxWidgets/pull/1081 Closes #18297. --- docs/changes.txt | 4 ++++ src/common/translation.cpp | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index fc7fcb1e00..c3d49daf94 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -108,6 +108,10 @@ Changes in behaviour which may result in build errors 3.1.3: (released 2019-??-??) ---------------------------- +All: + +- Fix regression in wxTranslations::AddCatalog() in 3.1.2 (Tomasz Słodkowicz). + All (GUI): - Fix wxInfoBar close button size in high DPI (Stefan Ziegler). diff --git a/src/common/translation.cpp b/src/common/translation.cpp index 7d9937cd18..26515b4c9b 100644 --- a/src/common/translation.cpp +++ b/src/common/translation.cpp @@ -1574,18 +1574,18 @@ bool wxTranslations::AddCatalog(const wxString& domain, wxS("adding '%s' translation for domain '%s' (msgid language '%s')"), *lang, domain, msgIdLang); - // No use loading languages that are less preferred than the - // msgid language, as by definition it contains all the strings - // in the msgid language. - if ( msgIdLang == *lang ) - break; - // We determine success by the success of loading/failing to load // the most preferred (i.e. the first one) language's catalog: if ( lang == domain_langs.begin() ) success = LoadCatalog(domain, *lang, msgIdLang); else LoadCatalog(domain, *lang, msgIdLang); + + // No use loading languages that are less preferred than the + // msgid language, as by definition it contains all the strings + // in the msgid language. + if ( msgIdLang == *lang ) + break; } return success; From 80904d1bc786ad2f6f8ab523391edfc82375820d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20S=C5=82odkowicz?= Date: Mon, 17 Dec 2018 04:38:35 +0100 Subject: [PATCH 74/77] Fix crash in translations code when no translations are found Fix another regression in wxTranslations in 3.1.2 and check that the vector of acceptable translations is not empty before using its first element. Closes https://github.com/wxWidgets/wxWidgets/pull/1082 Closes #18299. --- src/common/translation.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/translation.cpp b/src/common/translation.cpp index 26515b4c9b..08c4bfd7ad 100644 --- a/src/common/translation.cpp +++ b/src/common/translation.cpp @@ -1676,9 +1676,9 @@ wxString wxTranslations::GetBestTranslation(const wxString& domain, const wxString& msgIdLanguage) { const wxArrayString allGoodOnes = GetAcceptableTranslations(domain, msgIdLanguage); - - wxLogTrace(TRACE_I18N, " => using language '%s'", allGoodOnes[0]); - return allGoodOnes[0]; + wxString best(allGoodOnes.empty() ? wxString() : allGoodOnes[0]); + wxLogTrace(TRACE_I18N, " => using language '%s'", best); + return best; } wxArrayString wxTranslations::GetAcceptableTranslations(const wxString& domain, From ae20edb5397f6aa9c5bb6800119d0ebf70750984 Mon Sep 17 00:00:00 2001 From: Graham Dawes Date: Mon, 17 Dec 2018 11:48:59 +0000 Subject: [PATCH 75/77] Fix several problem with wxMemoryDC in wxQt Under wxQT, wxMemoryDC was previously rendering to a temporary image which was only being blitted back to the original wxBitmap when either the DC wx destroyed or a new bitmap was selected (via SelectObject). With these change wxMemoryDCImpl now draws directly to the bitmap managed by wxBitmap, this makes the behaviour more consistent with the MSW and GTK implementations. Closes https://github.com/wxWidgets/wxWidgets/pull/1083 --- include/wx/qt/dc.h | 4 ++-- include/wx/qt/dcscreen.h | 4 +--- src/qt/dc.cpp | 35 +++++++++++++++++++++++------------ src/qt/dcclient.cpp | 2 -- src/qt/dcmemory.cpp | 34 +++++++++------------------------- src/qt/dcscreen.cpp | 20 +++++--------------- 6 files changed, 40 insertions(+), 59 deletions(-) diff --git a/include/wx/qt/dc.h b/include/wx/qt/dc.h index 94623e4201..56849a2124 100644 --- a/include/wx/qt/dc.h +++ b/include/wx/qt/dc.h @@ -111,10 +111,10 @@ public: virtual void* GetHandle() const { return (void*) m_qtPainter; } protected: - virtual QImage *GetQImage() { return m_qtImage; } + virtual QPixmap *GetQPixmap() { return m_qtPixmap; } QPainter *m_qtPainter; - QImage *m_qtImage; + QPixmap *m_qtPixmap; wxRegion *m_clippingRegion; private: diff --git a/include/wx/qt/dcscreen.h b/include/wx/qt/dcscreen.h index c6c19b4848..f2fba75bca 100644 --- a/include/wx/qt/dcscreen.h +++ b/include/wx/qt/dcscreen.h @@ -19,9 +19,7 @@ public: protected: virtual void DoGetSize(int *width, int *height) const wxOVERRIDE; - virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const; - - virtual QImage *GetQImage(); + virtual QPixmap *GetQPixmap() wxOVERRIDE; wxDECLARE_ABSTRACT_CLASS(wxScreenDCImpl); }; diff --git a/src/qt/dc.cpp b/src/qt/dc.cpp index 8098a03dcf..737d1554d1 100644 --- a/src/qt/dc.cpp +++ b/src/qt/dc.cpp @@ -47,7 +47,7 @@ wxQtDCImpl::wxQtDCImpl( wxDC *owner ) : wxDCImpl( owner ) { m_clippingRegion = new wxRegion; - m_qtImage = NULL; + m_qtPixmap = NULL; m_rasterColourOp = wxQtNONE; m_qtPenColor = new QColor; m_qtBrushColor = new QColor; @@ -474,15 +474,18 @@ bool wxQtDCImpl::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const if ( col ) { - wxCHECK_MSG( m_qtImage != NULL, false, "This DC doesn't support GetPixel()" ); - - QColor pixel = m_qtImage->pixel( x, y ); + wxCHECK_MSG( m_qtPixmap != NULL, false, "This DC doesn't support GetPixel()" ); + QPixmap pixmap1px = m_qtPixmap->copy( x, y, 1, 1 ); + QImage image = pixmap1px.toImage(); + QColor pixel = image.pixel( 0, 0 ); col->Set( pixel.red(), pixel.green(), pixel.blue(), pixel.alpha() ); return true; } else + { return false; + } } void wxQtDCImpl::DoDrawPoint(wxCoord x, wxCoord y) @@ -739,23 +742,31 @@ bool wxQtDCImpl::DoBlit(wxCoord xdest, wxCoord ydest, { wxQtDCImpl *implSource = (wxQtDCImpl*)source->GetImpl(); - QImage *qtSource = implSource->GetQImage(); + QPixmap *qtSource = implSource->GetQPixmap(); // Not a CHECK on purpose if ( !qtSource ) return false; - QImage qtSourceConverted = *qtSource; - if ( !useMask ) - qtSourceConverted = qtSourceConverted.convertToFormat( QImage::Format_RGB32 ); - // Change logical function wxRasterOperationMode savedMode = GetLogicalFunction(); SetLogicalFunction( rop ); - m_qtPainter->drawImage( QRect( xdest, ydest, width, height ), - qtSourceConverted, - QRect( xsrc, ysrc, width, height ) ); + if ( useMask ) + { + m_qtPainter->drawPixmap( QRect( xdest, ydest, width, height ), + *qtSource, + QRect( xsrc, ysrc, width, height ) ); + } + else + { + QImage qtSourceConverted = qtSource->toImage(); + qtSourceConverted = qtSourceConverted.convertToFormat(QImage::Format_RGB32); + + m_qtPainter->drawImage( QRect( xdest, ydest, width, height ), + qtSourceConverted, + QRect( xsrc, ysrc, width, height ) ); + } SetLogicalFunction( savedMode ); diff --git a/src/qt/dcclient.cpp b/src/qt/dcclient.cpp index 696b69e2d4..eea8088a42 100644 --- a/src/qt/dcclient.cpp +++ b/src/qt/dcclient.cpp @@ -31,7 +31,6 @@ wxWindowDCImpl::wxWindowDCImpl( wxDC *owner ) : wxQtDCImpl( owner ) { m_window = NULL; - m_qtImage = NULL; m_ok = false; m_qtPainter = new QPainter(); } @@ -40,7 +39,6 @@ wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *win ) : wxQtDCImpl( owner ) { m_window = win; - m_qtImage = NULL; m_qtPainter = m_window->QtGetPainter(); // if we're not inside a Paint event, painter will invalid m_ok = m_qtPainter != NULL; diff --git a/src/qt/dcmemory.cpp b/src/qt/dcmemory.cpp index 3f85c3e3db..563d1cff1f 100644 --- a/src/qt/dcmemory.cpp +++ b/src/qt/dcmemory.cpp @@ -16,7 +16,6 @@ wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner ) : wxQtDCImpl( owner ) { - m_qtImage = NULL; m_ok = false; m_qtPainter = new QPainter(); } @@ -24,7 +23,6 @@ wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner ) wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap ) : wxQtDCImpl( owner ) { - m_qtImage = NULL; m_ok = false; m_qtPainter = new QPainter(); DoSelect( bitmap ); @@ -33,7 +31,6 @@ wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap ) wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *WXUNUSED(dc) ) : wxQtDCImpl( owner ) { - m_qtImage = NULL; m_ok = false; m_qtPainter = new QPainter(); } @@ -50,34 +47,21 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap ) { // Finish the painting in the intermediate image device: m_qtPainter->end(); - - if (m_selected.IsOk() && !m_selected.GetHandle()->isNull()) - { - // Copy intermediate image to the bitmap - m_qtPainter->begin( m_selected.GetHandle() ); - m_qtPainter->drawImage( QPoint( 0, 0 ), *m_qtImage ); - m_qtPainter->end(); - } m_ok = false; } // clean up the intermediate image device: - if ( m_qtImage ) - { - delete m_qtImage; - m_qtImage = NULL; - } - m_selected = bitmap; - if ( bitmap.IsOk() && !bitmap.GetHandle()->isNull() ) { - QPixmap pixmap(*bitmap.GetHandle()); - // apply mask before converting to image - if ( bitmap.GetMask() && bitmap.GetMask()->GetHandle() ) - pixmap.setMask(*bitmap.GetMask()->GetHandle()); - // create the intermediate image for the pixmap: - m_qtImage = new QImage( pixmap.toImage() ); + m_qtPixmap = bitmap.GetHandle(); + if ( bitmap.IsOk() && !m_qtPixmap->isNull() ) + { + // apply mask before drawing + wxMask *mask = bitmap.GetMask(); + if ( mask && mask->GetHandle() ) + m_qtPixmap->setMask(*mask->GetHandle()); + // start drawing on the intermediary device: - m_ok = m_qtPainter->begin( m_qtImage ); + m_ok = m_qtPainter->begin( m_qtPixmap ); SetPen(m_pen); SetBrush(m_brush); diff --git a/src/qt/dcscreen.cpp b/src/qt/dcscreen.cpp index b42445ea3a..12b02f6715 100644 --- a/src/qt/dcscreen.cpp +++ b/src/qt/dcscreen.cpp @@ -21,12 +21,11 @@ wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl); wxScreenDCImpl::wxScreenDCImpl( wxScreenDC *owner ) : wxWindowDCImpl( owner ) { - m_qtImage = NULL; } wxScreenDCImpl::~wxScreenDCImpl( ) { - delete m_qtImage; + delete m_qtPixmap; } void wxScreenDCImpl::DoGetSize(int *width, int *height) const @@ -34,19 +33,10 @@ void wxScreenDCImpl::DoGetSize(int *width, int *height) const wxDisplaySize(width, height); } -bool wxScreenDCImpl::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const -{ -// const_cast(this)->GetQImage(); -// return wxQtDCImpl::DoGetPixel(x, y, col); - x = y = 0; - col = 0; - return false; -} - // defered allocation for blit -QImage *wxScreenDCImpl::GetQImage() +QPixmap *wxScreenDCImpl::GetQPixmap() { - if ( !m_qtImage ) - m_qtImage = new QImage(QApplication::primaryScreen()->grabWindow(QApplication::desktop()->winId()).toImage()); - return m_qtImage; + if ( !m_qtPixmap ) + m_qtPixmap = new QPixmap(QApplication::primaryScreen()->grabWindow(QApplication::desktop()->winId())); + return m_qtPixmap; } From c47c7de5eaa25992ab4f1ff8511123f6c67dccb3 Mon Sep 17 00:00:00 2001 From: Jay Nabonne Date: Wed, 19 Dec 2018 08:57:04 +0000 Subject: [PATCH 76/77] Allow overriding the label for stock buttons in wxQt Stock label should only be used if passed label is empty. Otherwise, passed label should override the default value. Closes https://github.com/wxWidgets/wxWidgets/pull/1086 --- src/qt/button.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt/button.cpp b/src/qt/button.cpp index 7b7a2e992e..0bd270f1c9 100644 --- a/src/qt/button.cpp +++ b/src/qt/button.cpp @@ -45,7 +45,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& name ) { QtCreate(parent); - SetLabel( wxIsStockID( id ) ? wxGetStockLabel( id ) : label ); + SetLabel( label.IsEmpty() && wxIsStockID( id ) ? wxGetStockLabel( id ) : label ); return QtCreateControl( parent, id, pos, size, style, validator, name ); } From c6d3b9c0b9d7f4837c675e1c0c6135d937f06b32 Mon Sep 17 00:00:00 2001 From: Jay Nabonne Date: Wed, 19 Dec 2018 09:05:29 +0000 Subject: [PATCH 77/77] Fix background colour used by DrawEllipse() in wxQt wxDC::DrawEllipse() used to use the text background for filling the ellipses drawn with transparent pen, for some reason. According to f9b28cd4325f42936d3122bfe7c847354bbbfee9 which changed this (this commit was part of df13791078f107edda80f50f1ab498ad936ff069 merge done with svn), this was done for compatibility with wxGTK, but wxGTK definitely doesn't do it now and apparently never did, so there must have been some mistake. Simply remove the extra code using the text background for consistency with this method behaviour in the other ports and also other methods behaviour in the same port. Closes https://github.com/wxWidgets/wxWidgets/pull/1087 --- src/qt/dc.cpp | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/qt/dc.cpp b/src/qt/dc.cpp index 737d1554d1..e5405276cd 100644 --- a/src/qt/dc.cpp +++ b/src/qt/dc.cpp @@ -577,29 +577,13 @@ void wxQtDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, void wxQtDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { - QBrush savedBrush; - int penWidth = m_qtPainter->pen().width(); + const int penWidth = m_qtPainter->pen().width(); x += penWidth / 2; y += penWidth / 2; width -= penWidth; height -= penWidth; - if ( m_pen.IsNonTransparent() ) - { - // Save pen/brush - savedBrush = m_qtPainter->brush(); - // Fill with text background color ("no fill" like in wxGTK): - m_qtPainter->setBrush(QBrush(m_textBackgroundColour.GetQColor())); - } - - // Draw m_qtPainter->drawEllipse( x, y, width, height ); - - if ( m_pen.IsNonTransparent() ) - { - //Restore saved settings - m_qtPainter->setBrush(savedBrush); - } } void wxQtDCImpl::DoCrossHair(wxCoord x, wxCoord y)