Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
ddae8107b7 |
@@ -70,7 +70,7 @@ wx_top_builddir = @wx_top_builddir@
|
||||
DESTDIR =
|
||||
WX_RELEASE = 2.8
|
||||
WX_RELEASE_NODOT = 28
|
||||
WX_VERSION = $(WX_RELEASE).2
|
||||
WX_VERSION = $(WX_RELEASE).3
|
||||
LIBDIRNAME = $(wx_top_builddir)/lib
|
||||
WXREGEX_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \
|
||||
$(CPPFLAGS) $(CFLAGS)
|
||||
@@ -1511,7 +1511,7 @@ LOCALE_MSW_LINGUAS = it
|
||||
@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
|
||||
@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
|
||||
@COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
|
||||
@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.0 -current_version 2.0
|
||||
@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.0 -current_version 2.1
|
||||
@COND_USE_GUI_0@PORTNAME = base
|
||||
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
|
||||
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
|
||||
@@ -11241,9 +11241,9 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
|
||||
@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).0.1.0
|
||||
@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@ .$(SO_SUFFIX).0.1.1
|
||||
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \
|
||||
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.1.0.$(SO_SUFFIX)
|
||||
@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.1.1.$(SO_SUFFIX)
|
||||
@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX)
|
||||
@COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
|
||||
@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
changes, change C:R:A to C:R+1:A
|
||||
-->
|
||||
<set var="WX_CURRENT">1</set>
|
||||
<set var="WX_REVISION">0</set>
|
||||
<set var="WX_REVISION">1</set>
|
||||
<set var="WX_AGE">1</set>
|
||||
|
||||
|
||||
|
||||
@@ -4141,7 +4141,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
|
||||
build_cfg_file: $(SETUPHDIR)
|
||||
@echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
|
||||
@echo WXVER_MINOR=8 >>$(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)
|
||||
|
||||
@@ -4258,7 +4258,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
|
||||
build_cfg_file: $(SETUPHDIR)
|
||||
@echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
|
||||
@echo WXVER_MINOR=8 >>$(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)
|
||||
|
||||
@@ -4474,7 +4474,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs
|
||||
build_cfg_file: $(SETUPHDIR)
|
||||
@echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
|
||||
@echo WXVER_MINOR=8 >>$(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)
|
||||
|
||||
@@ -4486,7 +4486,7 @@ $(SETUPHDIR)\wx\msw\rcdefs.h : $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcde
|
||||
build_cfg_file : .SYMBOLIC $(SETUPHDIR)
|
||||
@echo WXVER_MAJOR=2 >$(BUILD_CFG_FILE)
|
||||
@echo WXVER_MINOR=8 >>$(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)
|
||||
|
||||
20
configure
vendored
20
configure
vendored
@@ -1,7 +1,7 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in.
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.2.
|
||||
# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.3.
|
||||
#
|
||||
# Report bugs to <wx-dev@lists.wxwidgets.org>.
|
||||
#
|
||||
@@ -270,8 +270,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='wxWidgets'
|
||||
PACKAGE_TARNAME='wxwidgets'
|
||||
PACKAGE_VERSION='2.8.2'
|
||||
PACKAGE_STRING='wxWidgets 2.8.2'
|
||||
PACKAGE_VERSION='2.8.3'
|
||||
PACKAGE_STRING='wxWidgets 2.8.3'
|
||||
PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org'
|
||||
|
||||
ac_unique_file="wx-config.in"
|
||||
@@ -870,7 +870,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 2.8.2 to adapt to many kinds of systems.
|
||||
\`configure' configures wxWidgets 2.8.3 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@@ -936,7 +936,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of wxWidgets 2.8.2:";;
|
||||
short | recursive ) echo "Configuration of wxWidgets 2.8.3:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@@ -1339,7 +1339,7 @@ fi
|
||||
test -n "$ac_init_help" && exit 0
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
wxWidgets configure 2.8.2
|
||||
wxWidgets configure 2.8.3
|
||||
generated by GNU Autoconf 2.59
|
||||
|
||||
Copyright (C) 2003 Free Software Foundation, Inc.
|
||||
@@ -1353,7 +1353,7 @@ cat >&5 <<_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 2.8.2, which was
|
||||
It was created by wxWidgets $as_me 2.8.3, which was
|
||||
generated by GNU Autoconf 2.59. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@@ -1804,7 +1804,7 @@ test -n "$target_alias" &&
|
||||
|
||||
wx_major_version_number=2
|
||||
wx_minor_version_number=8
|
||||
wx_release_number=2
|
||||
wx_release_number=3
|
||||
wx_subrelease_number=0
|
||||
|
||||
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
|
||||
@@ -51442,7 +51442,7 @@ _ASBOX
|
||||
} >&5
|
||||
cat >&5 <<_CSEOF
|
||||
|
||||
This file was extended by wxWidgets $as_me 2.8.2, which was
|
||||
This file was extended by wxWidgets $as_me 2.8.3, which was
|
||||
generated by GNU Autoconf 2.59. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@@ -51505,7 +51505,7 @@ _ACEOF
|
||||
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
ac_cs_version="\\
|
||||
wxWidgets config.status 2.8.2
|
||||
wxWidgets config.status 2.8.3
|
||||
configured by $0, generated by GNU Autoconf 2.59,
|
||||
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ dnl ---------------------------------------------------------------------------
|
||||
dnl initialization
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
AC_INIT([wxWidgets], [2.8.2], [wx-dev@lists.wxwidgets.org])
|
||||
AC_INIT([wxWidgets], [2.8.3], [wx-dev@lists.wxwidgets.org])
|
||||
|
||||
dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
|
||||
AC_CONFIG_SRCDIR([wx-config.in])
|
||||
@@ -34,7 +34,7 @@ dnl wx_release_number += 1
|
||||
|
||||
wx_major_version_number=2
|
||||
wx_minor_version_number=8
|
||||
wx_release_number=2
|
||||
wx_release_number=3
|
||||
wx_subrelease_number=0
|
||||
|
||||
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
|
||||
|
||||
@@ -68,7 +68,7 @@ getfilelist(){
|
||||
fi
|
||||
|
||||
if [ $port = "gtk" ] || [ $port = "all" ]; then
|
||||
filelist="$filelist gtk.rsp"
|
||||
filelist="$filelist gtk.rsp gtk1.rsp"
|
||||
fi
|
||||
|
||||
if [ $port = "motif" ] || [ $port = "all" ]; then
|
||||
|
||||
@@ -879,6 +879,7 @@ samples/minimal/*.rc
|
||||
samples/minimal/*.pro
|
||||
samples/minimal/*.bkl
|
||||
samples/minimal/*.r
|
||||
samples/minimal/Info.plist
|
||||
|
||||
samples/minifram/*.h
|
||||
samples/minifram/*.cpp
|
||||
|
||||
@@ -88,6 +88,25 @@ Major new features in 2.8 release
|
||||
wxSearchCtrl, wxAboutBox, wxTreebook, tar streams.
|
||||
|
||||
|
||||
2.8.3
|
||||
-----
|
||||
|
||||
All:
|
||||
|
||||
- Shut down the sockets gracefully (Sergio Aguayo)
|
||||
- Fix extra indentation in wxHTML_ALIGN_JUSTIFY display (Chacal)
|
||||
|
||||
wxMac
|
||||
|
||||
- Corrected top border size for wxStaticBox with empty label (nusi).
|
||||
- Fixed wxFont, wxPen and wxBrush accessor bugs introduced in 2.8.2.
|
||||
|
||||
wxMSW:
|
||||
|
||||
- Fixed wxFileName::GetSize() for large files.
|
||||
- Fixed wxFont and wxPen accessor bugs introduced in 2.8.2.
|
||||
|
||||
|
||||
2.8.2
|
||||
-----
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
%\special{!/@scaleunit 1 def}
|
||||
\parskip=10pt
|
||||
\parindent=0pt
|
||||
\title{wxWidgets 2.8.2: A portable C++ and Python GUI toolkit}
|
||||
\title{wxWidgets 2.8.3: A portable C++ and Python GUI toolkit}
|
||||
\winhelponly{\author{by Julian Smart et al
|
||||
%\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
|
||||
}}
|
||||
|
||||
@@ -766,9 +766,9 @@ VENDOR=<your company name>
|
||||
distribute wxWidgets DLLs with your application. Default value is 'custom'.
|
||||
This string is included as part of DLL name. wxWidgets DLLs contain compiler
|
||||
name, version information and vendor name in them. For example
|
||||
wxmsw280_core_bcc_custom.dll is one of DLLs build using Borland C++ with
|
||||
wxmsw283_core_bcc_custom.dll is one of DLLs build using Borland C++ with
|
||||
default settings. If you set VENDOR=mycorp, the name will change to
|
||||
wxmsw280_core_bcc_mycorp.dll.
|
||||
wxmsw283_core_bcc_mycorp.dll.
|
||||
|
||||
CFG=<configuration name>
|
||||
Sets configuration name so that you can have multiple wxWidgets builds with
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
wxWidgets 2.8.2
|
||||
wxWidgets 2.8.3
|
||||
---------------------------------------------------------
|
||||
|
||||
Welcome to wxWidgets, a sophisticated cross-platform C++
|
||||
|
||||
@@ -10,11 +10,13 @@
|
||||
{wx}/configure.in
|
||||
{wx}/*.spec
|
||||
{wx}/include/wx/version.h
|
||||
{wx}/include/msvc/wx/setup.h
|
||||
{wx}/include/msvc/wx/setup.h {major release only}
|
||||
{wx}/docs/latex/wx/manual.tex
|
||||
{wx}/docs/msw/install.txt
|
||||
{wx}/docs/changes.txt
|
||||
{wx}/build/bakefiles/wxpresets/presets/wx_win32.bkl
|
||||
{wx}/docs/changes.txt
|
||||
{wx}/docs/readme.txt
|
||||
{wx}/build/bakefiles/wxpresets/presets/wx_win32.bkl {major release only}
|
||||
{wx}/build/bakefiles/version.bkl {C:R:A}
|
||||
{wx}/build/script/win_docs.bat {windows doc and setup file}
|
||||
{wx}/distrib/scripts/build-environ.cfg {cvs tar and zip files}
|
||||
|
||||
@@ -33,6 +35,12 @@
|
||||
Version: $Id$
|
||||
|
||||
$Log$
|
||||
Revision 1.10.2.3 2007/03/15 14:55:02 CE
|
||||
add readme.txt to files to change
|
||||
|
||||
Revision 1.10.2.2 2007/03/15 09:54:04 CE
|
||||
update to 2.8.3 (configure and version.bkl to follow)
|
||||
|
||||
Revision 1.10.2.1 2007/02/12 10:54:52 CE
|
||||
add docs/msw/install.txt
|
||||
|
||||
|
||||
@@ -116,9 +116,9 @@
|
||||
#define WXWIN_OS_DESCRIPTION "Darwin 7.9.0 Power Macintosh"
|
||||
#define PACKAGE_BUGREPORT "wx-dev@lists.wxwidgets.org"
|
||||
#define PACKAGE_NAME "wxWidgets"
|
||||
#define PACKAGE_STRING "wxWidgets 2.7.1"
|
||||
#define PACKAGE_STRING "wxWidgets 2.8.3"
|
||||
#define PACKAGE_TARNAME "wxwidgets"
|
||||
#define PACKAGE_VERSION "2.7.1"
|
||||
#define PACKAGE_VERSION "2.8.3"
|
||||
|
||||
// for regex
|
||||
#define WX_NO_REGEX_ADVANCED 1
|
||||
|
||||
@@ -28,9 +28,9 @@
|
||||
/* NB: this file is parsed by automatic tools so don't change its format! */
|
||||
#define wxMAJOR_VERSION 2
|
||||
#define wxMINOR_VERSION 8
|
||||
#define wxRELEASE_NUMBER 2
|
||||
#define wxRELEASE_NUMBER 3
|
||||
#define wxSUBRELEASE_NUMBER 0
|
||||
#define wxVERSION_STRING _T("wxWidgets 2.8.2")
|
||||
#define wxVERSION_STRING _T("wxWidgets 2.8.3")
|
||||
|
||||
/* nothing to update below this line when updating the version */
|
||||
/* ---------------------------------------------------------------------------- */
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>$(PRODUCT_NAME)</string>
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string>$(PRODUCT_NAME) version 2.6.0, (c) 2006 wxWidgets</string>
|
||||
<string>$(PRODUCT_NAME) version 2.8.3, (c) 2007 wxWidgets</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>wxmac.icns</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
@@ -15,22 +15,22 @@
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleLongVersionString</key>
|
||||
<string>2.6.0, (c) 2006 wxWidgets</string>
|
||||
<string>2.8.3, (c) 2007 wxWidgets</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>minimal</string>
|
||||
<string>$(PRODUCT_NAME)</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>2.6.0</string>
|
||||
<string>2.8.3</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>2.6.0</string>
|
||||
<string>2.8.3</string>
|
||||
<key>CSResourcesFileMapped</key>
|
||||
<true/>
|
||||
<key>LSRequiresCarbon</key>
|
||||
<true/>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string>Copyright 2006 wxWidgets</string>
|
||||
<string>Copyright 2007 wxWidgets</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
||||
@@ -7,30 +7,30 @@
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>$(PRODUCT_NAME)</string>
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string>minimal version 2.6.0, (c) 2005 wxWidgets</string>
|
||||
<string>$(PRODUCT_NAME) version 2.8.3, (c) 2007 wxWidgets</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>wxmac.icns</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.wxwidgets.samples.minimal</string>
|
||||
<string>org.wxwidgets.samples.$(PRODUCT_NAME)</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleLongVersionString</key>
|
||||
<string>2.6.0, (c) 2005 wxWidgets</string>
|
||||
<string>2.8.3, (c) 2007 wxWidgets</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>minimal</string>
|
||||
<string>$(PRODUCT_NAME)</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>2.6.0</string>
|
||||
<string>2.8.3</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>2.6.0</string>
|
||||
<string>2.8.3</string>
|
||||
<key>CSResourcesFileMapped</key>
|
||||
<true/>
|
||||
<key>LSRequiresCarbon</key>
|
||||
<true/>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string>Copyright 2005 wxWidgets</string>
|
||||
<string>Copyright 2007 wxWidgets</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
||||
@@ -466,7 +466,6 @@
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
ARCHS = "$(NATIVE_ARCH)";
|
||||
GCC_PRECOMPILE_PREFIX_HEADER = YES;
|
||||
GCC_PREFIX_HEADER = ../../include/wx/wxprec.h;
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
@@ -595,10 +594,6 @@
|
||||
1842CAB508565A280032BCF7 /* Development */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ARCHS = (
|
||||
ppc,
|
||||
i386,
|
||||
);
|
||||
COPY_PHASE_STRIP = NO;
|
||||
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||
|
||||
@@ -424,7 +424,7 @@ wxString wxExpandEnvVars(const wxString& str)
|
||||
else {
|
||||
// skip closing bracket unless the variables wasn't expanded
|
||||
if ( pszValue == NULL )
|
||||
strResult << (char)bracket;
|
||||
strResult << (wxChar)bracket;
|
||||
m++;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2328,14 +2328,11 @@ wxULongLong wxFileName::GetSize(const wxString &filename)
|
||||
|
||||
DWORD lpFileSizeHigh;
|
||||
DWORD ret = GetFileSize(f, &lpFileSizeHigh);
|
||||
if (ret == INVALID_FILE_SIZE)
|
||||
if ( ret == INVALID_FILE_SIZE && ::GetLastError() != NO_ERROR )
|
||||
return wxInvalidSize;
|
||||
|
||||
// compose the low-order and high-order byte sizes
|
||||
return wxULongLong(ret | (lpFileSizeHigh << sizeof(WORD)*2));
|
||||
|
||||
#else // ! __WIN32__
|
||||
|
||||
return wxULongLong(lpFileSizeHigh, ret);
|
||||
#else // ! __WIN32__
|
||||
wxStructStat st;
|
||||
#ifndef wxNEED_WX_UNISTD_H
|
||||
if (wxStat( filename.fn_str() , &st) != 0)
|
||||
|
||||
@@ -2811,20 +2811,23 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
|
||||
|
||||
bool has_alpha = HasAlpha();
|
||||
|
||||
const int w = GetWidth(),
|
||||
h = GetHeight();
|
||||
|
||||
// Create pointer-based array to accelerate access to wxImage's data
|
||||
unsigned char ** data = new unsigned char * [GetHeight()];
|
||||
unsigned char ** data = new unsigned char * [h];
|
||||
data[0] = GetData();
|
||||
for (i = 1; i < GetHeight(); i++)
|
||||
data[i] = data[i - 1] + (3 * GetWidth());
|
||||
for (i = 1; i < h; i++)
|
||||
data[i] = data[i - 1] + (3 * w);
|
||||
|
||||
// Same for alpha channel
|
||||
unsigned char ** alpha = NULL;
|
||||
if (has_alpha)
|
||||
{
|
||||
alpha = new unsigned char * [GetHeight()];
|
||||
alpha = new unsigned char * [h];
|
||||
alpha[0] = GetAlpha();
|
||||
for (i = 1; i < GetHeight(); i++)
|
||||
alpha[i] = alpha[i - 1] + GetWidth();
|
||||
for (i = 1; i < h; i++)
|
||||
alpha[i] = alpha[i - 1] + w;
|
||||
}
|
||||
|
||||
// precompute coefficients for rotation formula
|
||||
@@ -2839,9 +2842,9 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
|
||||
const wxRealPoint p0(centre_of_rotation.x, centre_of_rotation.y);
|
||||
|
||||
wxRealPoint p1 = wxRotatePoint (0, 0, cos_angle, sin_angle, p0);
|
||||
wxRealPoint p2 = wxRotatePoint (0, GetHeight(), cos_angle, sin_angle, p0);
|
||||
wxRealPoint p3 = wxRotatePoint (GetWidth(), 0, cos_angle, sin_angle, p0);
|
||||
wxRealPoint p4 = wxRotatePoint (GetWidth(), GetHeight(), cos_angle, sin_angle, p0);
|
||||
wxRealPoint p2 = wxRotatePoint (0, h, cos_angle, sin_angle, p0);
|
||||
wxRealPoint p3 = wxRotatePoint (w, 0, cos_angle, sin_angle, p0);
|
||||
wxRealPoint p4 = wxRotatePoint (w, h, cos_angle, sin_angle, p0);
|
||||
|
||||
int x1a = (int) floor (wxMin (wxMin(p1.x, p2.x), wxMin(p3.x, p4.x)));
|
||||
int y1a = (int) floor (wxMin (wxMin(p1.y, p2.y), wxMin(p3.y, p4.y)));
|
||||
@@ -2888,27 +2891,29 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
|
||||
// performing an inverse rotation (a rotation of -angle) and getting the
|
||||
// pixel at those coordinates
|
||||
|
||||
const int rH = rotated.GetHeight();
|
||||
const int rW = rotated.GetWidth();
|
||||
|
||||
// GRG: I've taken the (interpolating) test out of the loops, so that
|
||||
// it is done only once, instead of repeating it for each pixel.
|
||||
|
||||
int x;
|
||||
if (interpolating)
|
||||
{
|
||||
for (int y = 0; y < rotated.GetHeight(); y++)
|
||||
for (int y = 0; y < rH; y++)
|
||||
{
|
||||
for (x = 0; x < rotated.GetWidth(); x++)
|
||||
for (int x = 0; x < rW; x++)
|
||||
{
|
||||
wxRealPoint src = wxRotatePoint (x + x1a, y + y1a, cos_angle, -sin_angle, p0);
|
||||
|
||||
if (-0.25 < src.x && src.x < GetWidth() - 0.75 &&
|
||||
-0.25 < src.y && src.y < GetHeight() - 0.75)
|
||||
if (-0.25 < src.x && src.x < w - 0.75 &&
|
||||
-0.25 < src.y && src.y < h - 0.75)
|
||||
{
|
||||
// interpolate using the 4 enclosing grid-points. Those
|
||||
// points can be obtained using floor and ceiling of the
|
||||
// exact coordinates of the point
|
||||
int x1, y1, x2, y2;
|
||||
|
||||
if (0 < src.x && src.x < GetWidth() - 1)
|
||||
if (0 < src.x && src.x < w - 1)
|
||||
{
|
||||
x1 = wxRound(floor(src.x));
|
||||
x2 = wxRound(ceil(src.x));
|
||||
@@ -2918,7 +2923,7 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
|
||||
x1 = x2 = wxRound (src.x);
|
||||
}
|
||||
|
||||
if (0 < src.y && src.y < GetHeight() - 1)
|
||||
if (0 < src.y && src.y < h - 1)
|
||||
{
|
||||
y1 = wxRound(floor(src.y));
|
||||
y2 = wxRound(ceil(src.y));
|
||||
@@ -3041,17 +3046,16 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
|
||||
}
|
||||
else // not interpolating
|
||||
{
|
||||
for (int y = 0; y < rotated.GetHeight(); y++)
|
||||
for (int y = 0; y < rH; y++)
|
||||
{
|
||||
for (x = 0; x < rotated.GetWidth(); x++)
|
||||
for (int x = 0; x < rW; x++)
|
||||
{
|
||||
wxRealPoint src = wxRotatePoint (x + x1a, y + y1a, cos_angle, -sin_angle, p0);
|
||||
|
||||
const int xs = wxRound (src.x); // wxRound rounds to the
|
||||
const int ys = wxRound (src.y); // closest integer
|
||||
|
||||
if (0 <= xs && xs < GetWidth() &&
|
||||
0 <= ys && ys < GetHeight())
|
||||
if (0 <= xs && xs < w && 0 <= ys && ys < h)
|
||||
{
|
||||
unsigned char *p = data[ys] + (3 * xs);
|
||||
*(dst++) = *(p++);
|
||||
|
||||
@@ -115,6 +115,12 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
|
||||
wxBusyInfo::wxBusyInfo(const wxString& message, wxWindow *parent)
|
||||
{
|
||||
m_InfoFrame = new wxInfoFrame( parent, message);
|
||||
if ( parent && parent->HasFlag(wxSTAY_ON_TOP) )
|
||||
{
|
||||
// we must have this flag to be in front of our parent if it has it
|
||||
m_InfoFrame->SetWindowStyleFlag(wxSTAY_ON_TOP);
|
||||
}
|
||||
|
||||
m_InfoFrame->Show(true);
|
||||
m_InfoFrame->Refresh();
|
||||
m_InfoFrame->Update();
|
||||
|
||||
@@ -884,12 +884,12 @@ void wxHtmlContainerCell::Layout(int w)
|
||||
if ( step > 0 )
|
||||
{
|
||||
// first count the cells which will get extra space
|
||||
int total = 0;
|
||||
int total = -1;
|
||||
|
||||
const wxHtmlCell *c;
|
||||
if ( line != cell )
|
||||
{
|
||||
for ( c = line->GetNext(); c != cell; c = c->GetNext() )
|
||||
for ( c = line; c != cell; c = c->GetNext() )
|
||||
{
|
||||
if ( c->IsLinebreakAllowed() )
|
||||
{
|
||||
@@ -901,11 +901,22 @@ void wxHtmlContainerCell::Layout(int w)
|
||||
// and now extra space to those cells which merit it
|
||||
if ( total )
|
||||
{
|
||||
// first cell on line is not moved:
|
||||
line->SetPos(line->GetPosX() + s_indent,
|
||||
line->GetPosY() + ypos);
|
||||
// first visible cell on line is not moved:
|
||||
while (line !=cell && !line->IsLinebreakAllowed())
|
||||
{
|
||||
line->SetPos(line->GetPosX() + s_indent,
|
||||
line->GetPosY() + ypos);
|
||||
line = line->GetNext();
|
||||
}
|
||||
|
||||
if (line != cell)
|
||||
{
|
||||
line->SetPos(line->GetPosX() + s_indent,
|
||||
line->GetPosY() + ypos);
|
||||
|
||||
line = line->GetNext();
|
||||
}
|
||||
|
||||
line = line->GetNext();
|
||||
for ( int n = 0; line != cell; line = line->GetNext() )
|
||||
{
|
||||
if ( line->IsLinebreakAllowed() )
|
||||
|
||||
@@ -129,7 +129,7 @@ void wxBrush::Unshare()
|
||||
{
|
||||
m_refData = new wxBrushRefData();
|
||||
}
|
||||
else if (m_refData->GetRefCount() > 1)
|
||||
else
|
||||
{
|
||||
wxBrushRefData* ref = new wxBrushRefData(*(wxBrushRefData*)m_refData);
|
||||
UnRef();
|
||||
|
||||
@@ -456,7 +456,7 @@ void wxFont::Unshare()
|
||||
{
|
||||
m_refData = new wxFontRefData();
|
||||
}
|
||||
else if (m_refData->GetRefCount() > 1)
|
||||
else
|
||||
{
|
||||
wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
|
||||
UnRef();
|
||||
|
||||
@@ -93,7 +93,7 @@ void wxPen::Unshare()
|
||||
{
|
||||
m_refData = new wxPenRefData();
|
||||
}
|
||||
else if (m_refData->GetRefCount() > 1)
|
||||
else
|
||||
{
|
||||
wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData);
|
||||
UnRef();
|
||||
|
||||
@@ -68,7 +68,10 @@ void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
|
||||
}
|
||||
}
|
||||
|
||||
*borderTop = extraTop + GetCharHeight();
|
||||
*borderTop = extraTop;
|
||||
if ( !m_label.empty() )
|
||||
*borderTop += GetCharHeight();
|
||||
|
||||
*borderOther = other;
|
||||
}
|
||||
|
||||
|
||||
@@ -903,7 +903,7 @@ void wxFont::Unshare()
|
||||
{
|
||||
m_refData = new wxFontRefData();
|
||||
}
|
||||
else if (m_refData->GetRefCount() > 1)
|
||||
else
|
||||
{
|
||||
wxFontRefData* ref = new wxFontRefData(*M_FONTDATA);
|
||||
UnRef();
|
||||
|
||||
@@ -222,7 +222,7 @@ void GSocket::Shutdown()
|
||||
/* If socket has been created, shutdown it */
|
||||
if (m_fd != INVALID_SOCKET)
|
||||
{
|
||||
shutdown(m_fd, 2);
|
||||
shutdown(m_fd, 1 /* SD_SEND */);
|
||||
Close();
|
||||
}
|
||||
|
||||
|
||||
@@ -277,7 +277,7 @@ void wxPen::Unshare()
|
||||
{
|
||||
m_refData = new wxPenRefData();
|
||||
}
|
||||
else if (m_refData->GetRefCount() > 1)
|
||||
else
|
||||
{
|
||||
wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData);
|
||||
UnRef();
|
||||
|
||||
@@ -406,12 +406,15 @@ bool wxSpinCtrl::Create(wxWindow *parent,
|
||||
// Set the range in the native control
|
||||
SetRange(min, max);
|
||||
|
||||
// Send the initial event
|
||||
SendSpinUpdate(initial);
|
||||
|
||||
if ( !value.empty() )
|
||||
{
|
||||
SetValue(value);
|
||||
m_oldValue = (int) wxAtol(value);
|
||||
}
|
||||
else
|
||||
{
|
||||
SetValue(wxString::Format(wxT("%d"), initial));
|
||||
m_oldValue = initial;
|
||||
}
|
||||
|
||||
// do it after finishing with m_hwndBuddy creation to avoid generating
|
||||
|
||||
@@ -587,7 +587,7 @@ void GSocket::Shutdown()
|
||||
/* If socket has been created, shutdown it */
|
||||
if (m_fd != INVALID_SOCKET)
|
||||
{
|
||||
shutdown(m_fd, 2);
|
||||
shutdown(m_fd, 1);
|
||||
Close();
|
||||
}
|
||||
|
||||
|
||||
@@ -811,13 +811,15 @@ bool wxGetKeyState(wxKeyCode key)
|
||||
Window wDummy1, wDummy2;
|
||||
int iDummy3, iDummy4, iDummy5, iDummy6;
|
||||
unsigned int iMask;
|
||||
XModifierKeymap* map = XGetModifierMapping(pDisplay);
|
||||
KeyCode keyCode = XKeysymToKeycode(pDisplay,iKey);
|
||||
if (keyCode == NoSymbol)
|
||||
return false;
|
||||
|
||||
if ( IsModifierKey(iKey) ) // If iKey is a modifier key, use a different method
|
||||
{
|
||||
XModifierKeymap *map = XGetModifierMapping(pDisplay);
|
||||
wxCHECK_MSG( map, false, _T("failed to get X11 modifiers map") );
|
||||
|
||||
for (int i = 0; i < 8; ++i)
|
||||
{
|
||||
if ( map->modifiermap[map->max_keypermod * i] == keyCode)
|
||||
@@ -833,13 +835,13 @@ bool wxGetKeyState(wxKeyCode key)
|
||||
}
|
||||
|
||||
// From the XLib manual:
|
||||
// The XQueryKeymap() function returns a bit vector for the logical state of the keyboard,
|
||||
// where each bit set to 1 indicates that the corresponding key is currently pressed down.
|
||||
// The vector is represented as 32 bytes. Byte N (from 0) contains the bits for keys 8N to 8N + 7
|
||||
// The XQueryKeymap() function returns a bit vector for the logical state of the keyboard,
|
||||
// where each bit set to 1 indicates that the corresponding key is currently pressed down.
|
||||
// The vector is represented as 32 bytes. Byte N (from 0) contains the bits for keys 8N to 8N + 7
|
||||
// with the least-significant bit in the byte representing key 8N.
|
||||
char key_vector[32];
|
||||
XQueryKeymap(pDisplay, key_vector);
|
||||
return key_vector[keyCode >> 3] & (1 << (keyCode & 7));
|
||||
return key_vector[keyCode >> 3] & (1 << (keyCode & 7));
|
||||
}
|
||||
|
||||
#endif // __WXX11__ || __WXGTK__ || __WXMOTIF__
|
||||
|
||||
@@ -3301,6 +3301,7 @@
|
||||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = 18B5B98A08564B5D002803C9 /* Build configuration list for PBXNativeTarget "static" */;
|
||||
buildPhases = (
|
||||
4059FD3C0BA95691001F6B1C /* ShellScript */,
|
||||
4086C744063AB2FF00D4CD53 /* Headers */,
|
||||
4086C746063AB2FF00D4CD53 /* Sources */,
|
||||
4086C8C8063AB2FF00D4CD53 /* Frameworks */,
|
||||
@@ -3371,6 +3372,19 @@
|
||||
/* End PBXRezBuildPhase section */
|
||||
|
||||
/* Begin PBXShellScriptBuildPhase section */
|
||||
4059FD3C0BA95691001F6B1C /* ShellScript */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
);
|
||||
outputPaths = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "$SRCROOT/../distrib/mac/pbsetup-sh \"${SRCROOT}\" \"${SYMROOT}\"";
|
||||
};
|
||||
4086CA56063AB30000D4CD53 /* ShellScript */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
@@ -4489,8 +4503,8 @@
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
DYLIB_COMPATIBILITY_VERSION = 2.6;
|
||||
DYLIB_CURRENT_VERSION = 2.6.0;
|
||||
DYLIB_COMPATIBILITY_VERSION = 2.8;
|
||||
DYLIB_CURRENT_VERSION = 2.8.3;
|
||||
GCC_INPUT_FILETYPE = automatic;
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
GCC_PFE_FILE_C_DIALECTS = "c++";
|
||||
@@ -4532,8 +4546,8 @@
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
DYLIB_COMPATIBILITY_VERSION = 2.6;
|
||||
DYLIB_CURRENT_VERSION = 2.6.0;
|
||||
DYLIB_COMPATIBILITY_VERSION = 2.8;
|
||||
DYLIB_CURRENT_VERSION = 2.8.3;
|
||||
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
|
||||
GCC_INPUT_FILETYPE = automatic;
|
||||
GCC_PFE_FILE_C_DIALECTS = "c++";
|
||||
@@ -4574,10 +4588,9 @@
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
ARCHS = "$(NATIVE_ARCH)";
|
||||
DEBUG_INFORMATION_FORMAT = stabs;
|
||||
DYLIB_COMPATIBILITY_VERSION = 2.6;
|
||||
DYLIB_CURRENT_VERSION = 2.6.0;
|
||||
DYLIB_COMPATIBILITY_VERSION = 2.8;
|
||||
DYLIB_CURRENT_VERSION = 2.8.3;
|
||||
EXECUTABLE_PREFIX = lib;
|
||||
GCC_C_LANGUAGE_STANDARD = "compiler-default";
|
||||
GCC_DYNAMIC_NO_PIC = NO;
|
||||
@@ -4629,8 +4642,8 @@
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||
DYLIB_COMPATIBILITY_VERSION = 2.6;
|
||||
DYLIB_CURRENT_VERSION = 2.6.0;
|
||||
DYLIB_COMPATIBILITY_VERSION = 2.8;
|
||||
DYLIB_CURRENT_VERSION = 2.8.3;
|
||||
EXECUTABLE_PREFIX = lib;
|
||||
GCC_C_LANGUAGE_STANDARD = "compiler-default";
|
||||
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
|
||||
@@ -4716,10 +4729,6 @@
|
||||
18B5B99F08564B5D002803C9 /* Development */ = {
|
||||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
ARCHS = (
|
||||
ppc,
|
||||
i386,
|
||||
);
|
||||
GCC_ENABLE_FIX_AND_CONTINUE = YES;
|
||||
GCC_OPTIMIZATION_LEVEL = 1;
|
||||
GCC_PREPROCESSOR_DEFINITIONS = "__WXDEBUG__\n";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
%define pref /usr
|
||||
%define ver 2.8.2
|
||||
%define ver 2.8.3
|
||||
%define ver2 2.8
|
||||
%define rel 2
|
||||
%define rel 3
|
||||
|
||||
# Configurable settings (use --with(out) unicode on rpmbuild command line):
|
||||
%define unicode 0
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
%define _prefix /usr
|
||||
%define ver 2.8.2
|
||||
%define ver 2.8.3
|
||||
%define ver2 2.8
|
||||
%define rel 2
|
||||
%define rel 3
|
||||
|
||||
# Configurable settings (use --with(out) {unicode,gtk2} on rpmbuild cmd line):
|
||||
%define unicode 1
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
%define pref /usr
|
||||
%define ver 2.8.2
|
||||
%define ver 2.8.3
|
||||
%define ver2 2.8
|
||||
%define rel 2
|
||||
%define rel 3
|
||||
|
||||
Summary: The SciTech MGL port of the wxWindows library
|
||||
Name: wxMGL
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
%define pref /usr
|
||||
%define ver 2.8.2
|
||||
%define ver 2.8.3
|
||||
%define ver2 2.8
|
||||
%define rel 2
|
||||
%define rel 3
|
||||
|
||||
%define portname motif
|
||||
%define name wx-%{portname}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
%define pref /usr
|
||||
%define ver 2.8.2
|
||||
%define ver 2.8.3
|
||||
%define ver2 2.8
|
||||
%define rel 2
|
||||
%define rel 3
|
||||
|
||||
# Configurable settings (use --with(out) unicode on rpmbuild cmd line):
|
||||
%define unicode 0
|
||||
|
||||
Reference in New Issue
Block a user