Skip to content
Permalink
Browse files

update to v2.5.3

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@9250 d073be05-634f-4543-b044-5fe20cf6d1d6
  • Loading branch information
Markus W. Weißmann
Markus W. Weißmann committed Nov 11, 2004
1 parent e62781e commit 79fd4f8eb35c4ea520e3c27ab889ef03edfee2ac
@@ -1,9 +1,9 @@
# $Id: Portfile,v 1.5 2004/09/23 05:12:44 mww Exp $
# $Id: Portfile,v 1.6 2004/11/11 14:43:24 mww Exp $

PortSystem 1.0

name wxWidgets
version 2.5.2
version 2.5.3
categories graphics devel
platforms darwin
maintainers mww@opendarwin.org blb@pobox.com
@@ -16,10 +16,11 @@ long_description wxWidgets is a mature open-source cross-platform C++ \
Linux and X11.

homepage http://www.wxwidgets.org/
master_sites sourceforge:wxwindows \
ftp://biolpc22.york.ac.uk/pub/${version}/
master_sites ftp://biolpc22.york.ac.uk/pub/${version}/ \
sourceforge:wxwindows
distname wxAll-${version}
checksums md5 468d900fa4b34e2341879471c7631ed8
checksums md5 7c60c25223c9f76061fc7306ca2a6ec1
use_bzip2 yes

depends_lib lib:libjpeg:jpeg \
lib:libtiff:tiff \
@@ -37,7 +38,12 @@ post-extract {
system "touch ${workpath}/${name}-${version}/samples/tab/Makefile.in"
}

patchfiles patch-Makefile.in
patch.dir ${workpath}/${name}-${version}
patchfiles patch-Makefile.in \
patch-src-common-datetime.cpp \
patch-src-common-dcbase.cpp \
patch-src-gtk-mdi.cpp \
patch-src-msw-combobox.cpp

configure.cmd ../${name}-${version}/configure
configure.env CPPFLAGS="-I${prefix}/include" \
@@ -1,13 +1,13 @@
--- ../wxWidgets-2.5.2/Makefile.in Sat May 29 13:21:25 2004
+++ ../wxWidgets-2.5.2/Makefile.in.new Wed Sep 22 09:18:12 2004
@@ -7389,8 +7389,8 @@
@COND_TOOLKIT_MAC@ $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).2.rsrc Carbon.r -useDF >lib/libwx_$(TOOLCHAIN_NAME).2.r
--- Makefile.in Sat Oct 9 20:59:53 2004
+++ Makefile.in.new Thu Nov 11 11:59:42 2004
@@ -7911,8 +7911,8 @@
@COND_TOOLKIT_MAC@ $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).3.rsrc Carbon.r -useDF >lib/libwx_$(TOOLCHAIN_NAME).3.r

@COND_TOOLKIT_MAC@macos-res-install: $(__macos_res___depname)
-@COND_TOOLKIT_MAC@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).2.r $(libdir)
-@COND_TOOLKIT_MAC@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).2.rsrc $(libdir)
+@COND_TOOLKIT_MAC@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).2.r $(DESTDIR)$(libdir)
+@COND_TOOLKIT_MAC@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).2.rsrc $(DESTDIR)$(libdir)
-@COND_TOOLKIT_MAC@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).3.r $(libdir)
-@COND_TOOLKIT_MAC@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).3.rsrc $(libdir)
+@COND_TOOLKIT_MAC@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).3.r $(DESTDIR)$(libdir)
+@COND_TOOLKIT_MAC@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).3.rsrc $(DESTDIR)$(libdir)

@COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).2.r:
@COND_TOOLKIT_COCOA@ $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).2.rsrc
@COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).3.r:
@COND_TOOLKIT_COCOA@ $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).3.rsrc
@@ -0,0 +1,36 @@
--- src/common/datetime.cpp Thu Nov 11 12:11:57 2004
+++ datetime.cpp Thu Nov 11 12:11:50 2004
@@ -1168,16 +1168,11 @@
// less than timezone - try to make it work for this case
if ( tm2.tm_year == 70 && tm2.tm_mon == 0 && tm2.tm_mday == 1 )
{
- // add timezone to make sure that date is in range
- tm2.tm_sec -= GetTimeZone();
-
- timet = mktime(&tm2);
- if ( timet != (time_t)-1 )
- {
- timet += GetTimeZone();
-
- return Set(timet);
- }
+ return Set((time_t)(
+ GetTimeZone() +
+ tm2.tm_hour * MIN_PER_HOUR * SEC_PER_MIN +
+ tm2.tm_min * SEC_PER_MIN +
+ tm2.tm_sec));
}

wxFAIL_MSG( _T("mktime() failed") );
@@ -1262,7 +1257,10 @@
(void)Set(tm);

// and finally adjust milliseconds
- return SetMillisecond(millisec);
+ if (IsValid())
+ SetMillisecond(millisec);
+
+ return *this;
}
else
{
@@ -0,0 +1,13 @@
--- src/common/dcbase.cpp Sun Sep 19 17:05:53 2004
+++ dcbase.cpp Thu Nov 11 12:09:39 2004
@@ -316,6 +316,10 @@
double x1, y1, x2, y2;

wxList::compatibility_iterator node = points->GetFirst();
+ if (node == NULL)
+ // empty list
+ return;
+
p = (wxPoint *)node->GetData();

x1 = p->x;
@@ -0,0 +1,31 @@
--- src/gtk/mdi.cpp Thu Oct 7 09:52:11 2004
+++ mdi.cpp Thu Nov 11 12:10:05 2004
@@ -170,17 +170,19 @@

/* need to set the menubar of the child */
wxMDIChildFrame *active_child_frame = GetActiveChild();
- wxMenuBar *menu_bar = active_child_frame->m_menuBar;
- if (menu_bar)
+ if (active_child_frame != NULL)
{
- menu_bar->m_width = m_width;
- menu_bar->m_height = wxMENU_HEIGHT;
- gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
- menu_bar->m_widget,
- 0, 0, m_width, wxMENU_HEIGHT );
- menu_bar->SetInvokingWindow(active_child_frame);
+ wxMenuBar *menu_bar = active_child_frame->m_menuBar;
+ if (menu_bar)
+ {
+ menu_bar->m_width = m_width;
+ menu_bar->m_height = wxMENU_HEIGHT;
+ gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
+ menu_bar->m_widget,
+ 0, 0, m_width, wxMENU_HEIGHT );
+ menu_bar->SetInvokingWindow(active_child_frame);
+ }
}
-
m_justInserted = false;
return;
}
@@ -0,0 +1,18 @@
--- src/msw/combobox.cpp Sun Sep 19 17:06:09 2004
+++ combobox.cpp Thu Nov 11 12:10:29 2004
@@ -254,6 +254,15 @@
UnpackCtlColor(wParam, lParam, &nCtlColor, &hdc, &hwnd);

return (WXLRESULT)OnCtlColor(hdc, hwnd, nCtlColor, nMsg, wParam, lParam);
+
+ case CB_SETCURSEL:
+ // Selection was set with SetSelection. Update the value too.
+ if (wParam < 0 || wParam > GetCount())
+ m_value = wxEmptyString;
+ else
+ m_value = GetString(wParam);
+ break;
+
}

return wxChoice::MSWWindowProc(nMsg, wParam, lParam);

0 comments on commit 79fd4f8

Please sign in to comment.
You can’t perform that action at this time.