]> git.saurik.com Git - wxWidgets.git/log
wxWidgets.git
11 years agoUse wxRTC text colour if possible for caret
Julian Smart [Fri, 5 Jul 2013 16:26:37 +0000 (16:26 +0000)] 
Use wxRTC text colour if possible for caret

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoDon't flash wxRTC caret if blink time is zero, and also take colour from window text...
Julian Smart [Fri, 5 Jul 2013 13:33:30 +0000 (13:33 +0000)] 
Don't flash wxRTC caret if blink time is zero, and also take colour from window text colour to avoid invisibility.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoPrevent duplicate menu event processing in MDI windows.
Vadim Zeitlin [Wed, 3 Jul 2013 22:18:42 +0000 (22:18 +0000)] 
Prevent duplicate menu event processing in MDI windows.

Record the object propagating the given event upwards in the event object
itself and use it in wxMDIParentFrame to determine whether the event being
handled is already coming from wxMDIChildFrame and avoid sending it back for
processing it there again in this case.

This is ugly and makes wx event processing even more complex but this is the
only way I could find to ensure that

(a) Both the child and the parent frames get the events from the toolbar
    (even though the toolbar parent is the parent frame and hence normally
    the child wouldn't get notified about them at all and so the forwarding
    at wxMDIParentFrame level is required to make this work).

(b) The child gets the event only once, whether it comes from a toolbar (and
    hence indirectly via the parent frame) or from the child menu (and hence
    directly to the child, at least in wxMSW).

This commit fixes the event propagation unit test case, at least under MSW and
GTK.

See #14314.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoTest handling of events from the toolbar in an MDI parent frame.
Vadim Zeitlin [Wed, 3 Jul 2013 22:18:18 +0000 (22:18 +0000)] 
Test handling of events from the toolbar in an MDI parent frame.

These events must be received by the currently active child.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoEnsure that the MDI child is active in event propagation test.
Vadim Zeitlin [Wed, 3 Jul 2013 22:17:55 +0000 (22:17 +0000)] 
Ensure that the MDI child is active in event propagation test.

Call wxMDIChildFrame::Activate() explicitly as the behaviour was different
under MSW (where the activation happened too late for the test) and GTK where
the child did become active because of the hacks in place to ensure it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoMake AsyncExecLoopExitEnum enum in the wxExecute() test public.
Vadim Zeitlin [Wed, 3 Jul 2013 11:03:09 +0000 (11:03 +0000)] 
Make AsyncExecLoopExitEnum enum in the wxExecute() test public.

This fixes VC6 build as the nested class couldn't access a private enum inside
the enclosing class.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agofix wxCHECK_MSG() return value
Paul Cornett [Wed, 3 Jul 2013 03:12:44 +0000 (03:12 +0000)] 
fix wxCHECK_MSG() return value

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoDon't ignore child process output if it exits with -1 exit code.
Vadim Zeitlin [Wed, 3 Jul 2013 00:33:04 +0000 (00:33 +0000)] 
Don't ignore child process output if it exits with -1 exit code.

While this code is used by us if the program couldn't be launched at all, it
doesn't mean that it didn't run as -1 could also be returned by the child
process to indicate an error after outputting something, so we should still
read its output in this case.

Closes #15205.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoRun wxExecute() unit test in the GUI test suite too.
Vadim Zeitlin [Wed, 3 Jul 2013 00:32:40 +0000 (00:32 +0000)] 
Run wxExecute() unit test in the GUI test suite too.

The same code works differently in console and GUI applications, so build this
test case as part of both of them.

See #10258.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoRewrite wxExecute() implementation under Unix.
Vadim Zeitlin [Wed, 3 Jul 2013 00:32:16 +0000 (00:32 +0000)] 
Rewrite wxExecute() implementation under Unix.

This commit changes wxExecute() to handle SIGCHLD to be notified about the
child process termination instead of detecting when the file descriptor
corresponding to the other end of a pipe opened in the parent process was
closed in the child as this was not reliable and could (and did) result in not
detecting the termination of the child processes that closed all their file
descriptors before exiting.

This commit also removes a lot of platform-specific code duplicating the
generic event loop sources support and reuses it for wxExecute() purposes too.

Final big change is that wxEndProcessData was merged into wxExecuteData and we
don't have two similar but quite different classes any more but just one,
which is used both to pass the information from wxExecute() to wxAppTraits
methods and to store this information until the child termination.

Closes #10258.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoAdd a helper wxApp::GetValidTraits() method.
Vadim Zeitlin [Wed, 3 Jul 2013 00:31:49 +0000 (00:31 +0000)] 
Add a helper wxApp::GetValidTraits() method.

This method always returns some valid traits, even if we don't have wxTheApp
(which is possible in the console applications) or if its GetTraits() was
overridden to return NULL (which shouldn't be, but still guard against this).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoTreat G_IO_HUP as read, not error, event because EOF is not exceptional.
Vadim Zeitlin [Wed, 3 Jul 2013 00:31:26 +0000 (00:31 +0000)] 
Treat G_IO_HUP as read, not error, event because EOF is not exceptional.

When EOF is reached on a file descriptor, call the handler OnReadWaiting()
because this is not really different from getting to the EOF while reading
data in the same function. Only call OnExceptionWaiting() for the real errors.

See #10258.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoMake Unix wxAppConsole signal handling more flexible.
Vadim Zeitlin [Wed, 3 Jul 2013 00:31:03 +0000 (00:31 +0000)] 
Make Unix wxAppConsole signal handling more flexible.

Instead of hardcoding the call to WakeUpIdle() in the signal handler itself,
just wake up the event loop when we catch a signal. This will still result in
WakeUpIdle() being called, before the next event loop iteration, but it will
also allow us to do other things on wakeup from signal as it will be done in
the upcoming wxExecute() changes to support wxEXEC_NOEVENTS in console
applications.

See #10258.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoChange wxWakeUpPipe to be a wxEventLoopSourceHandler.
Vadim Zeitlin [Wed, 3 Jul 2013 00:30:39 +0000 (00:30 +0000)] 
Change wxWakeUpPipe to be a wxEventLoopSourceHandler.

No real changes but use wxEventLoopSource::AddSourceForFD() instead of
wxFDIODispatcher::RegisterFD() for this pipe because this is the preferred way
and because it will allow reusing this class for wxExecute() purposes later.

See #10258.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoInclude wx/evtloop.h from wx/evtloopsrc.h.
Vadim Zeitlin [Wed, 3 Jul 2013 00:30:16 +0000 (00:30 +0000)] 
Include wx/evtloop.h from wx/evtloopsrc.h.

This is necessary to ensure that wxUSE_EVENTLOOP_SOURCE which wraps the entire
contents of this header is defined if it's included directly and not after
already including wx/evtloop.h.

See #10258.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoInclude <fcntl.h> from a header using fcntl().
Vadim Zeitlin [Wed, 3 Jul 2013 00:29:53 +0000 (00:29 +0000)] 
Include <fcntl.h> from a header using fcntl().

No real changes, just make the header self-containing instead of relying on
the file including it to include <fcntl.h> itself.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoAdd wxStreamTempInputBuffer::ReadAll() helper.
Vadim Zeitlin [Wed, 3 Jul 2013 00:29:29 +0000 (00:29 +0000)] 
Add wxStreamTempInputBuffer::ReadAll() helper.

This just reads everything remaining in the stream in a blocking way and will
be used to get the data remaining in the stream buffers after the child
process had been already closed (and hence can't write any more to it and
there is no risk of deadlock).

See #10258.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoUse CFSocket instead of CFFileDescriptor in wxCFEventLoopSource.
Vadim Zeitlin [Wed, 3 Jul 2013 00:29:05 +0000 (00:29 +0000)] 
Use CFSocket instead of CFFileDescriptor in wxCFEventLoopSource.

Use OS X socket APIs for monitoring file descriptors. They are more flexible
than CFFileDescriptor functions and can be used with any descriptors, not
necessarily the socket ones.

See #10258.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoMake wxEventLoop::AddSourceForFD() static.
Vadim Zeitlin [Wed, 3 Jul 2013 00:28:42 +0000 (00:28 +0000)] 
Make wxEventLoop::AddSourceForFD() static.

Any event sources should be registered with all the event loops, including the
ones that will be started in the future, and not only the current (and
potentially not even existing yet) one. So make AddSourceForFD() method static.

To still allow it to do different things in console and GUI applications, as
it must, virtualize it via the new wxEventLoopSourcesManager class which has
different implementations in the two cases, returned via wxAppTraits as usual.

Notice that this required moving the implementation of this method from
src/osx/core/evtloop_cf.cpp to src/osx/core/utilsexc_cf.cpp as the former file
is base-only and didn't have access to wxGUIAppTraits.

See #10258.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoExtract wxFDIOEventLoopSourceHandler in its own header.
Vadim Zeitlin [Wed, 3 Jul 2013 00:28:16 +0000 (00:28 +0000)] 
Extract wxFDIOEventLoopSourceHandler in its own header.

No real changes, this is just in preparation for the further refactoring.

See #10258.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoSplit wxWakeUpPipe class in MT-unsafe and MT-safe parts.
Vadim Zeitlin [Wed, 3 Jul 2013 00:27:53 +0000 (00:27 +0000)] 
Split wxWakeUpPipe class in MT-unsafe and MT-safe parts.

This class can also be useful when it's used in the main thread only, so
leave the lock-less part of the code in wxWakeUpPipe and derive a separate
wxWakeUpPipeMT from it for the use in wxConsoleEventLoop where it can be used
by multiple threads.

See #10258.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoExtract PipeIOHandler class into a header and rename to wxWakeUpPipe.
Vadim Zeitlin [Wed, 3 Jul 2013 00:27:28 +0000 (00:27 +0000)] 
Extract PipeIOHandler class into a header and rename to wxWakeUpPipe.

No real changes to the class, just make it possible to reuse it outside of
Unix wxEventLoop code.

See #10258.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoNo changes, move wxStreamTempInputBuffer to a header file.
Vadim Zeitlin [Wed, 3 Jul 2013 00:27:02 +0000 (00:27 +0000)] 
No changes, move wxStreamTempInputBuffer to a header file.

Get rid of the surprising src/common/execcmn.cpp which had a .cpp extension
but was supposed to be used as an included file only and move its contents to
a new private header to make using wxStreamTempInputBuffer class simpler.

See #10258.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoExtract wxPipeInputStream and wxPipeOutputStream in a header.
Vadim Zeitlin [Wed, 3 Jul 2013 00:26:38 +0000 (00:26 +0000)] 
Extract wxPipeInputStream and wxPipeOutputStream in a header.

No real changes, just put these classes in a private header. They're still not
part of the public API but at least it will be easier to reuse them inside the
library itself in the upcoming commits.

See #10258.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoAdd wxEventLoop::ScheduleExit().
Vadim Zeitlin [Wed, 3 Jul 2013 00:26:13 +0000 (00:26 +0000)] 
Add wxEventLoop::ScheduleExit().

This method allows to request exiting from the given event loop even if it's
not the currently active one, unlike Exit() which would assert in this case.
With it, it becomes possible to ask the loop to terminate as soon as possible
even if a nested loop is currently running.

See #10258.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoUse normal event loop in GUI test program.
Vadim Zeitlin [Wed, 3 Jul 2013 00:25:46 +0000 (00:25 +0000)] 
Use normal event loop in GUI test program.

Don't create an event loop manually, let the port-specific code do it and run
it as usual in the GUI unit tests.

This has several advantages:
 - No need to manage the event loop manually in the test.
 - No need for Mac-specific code in the test itself.
 - Code being tested runs in the same context as in a normal GUI program,
   which is especially important for event-loop related tests under wxOSX as
   the main event loop is special there.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoAdd wxEventLoopBase::DoRun().
Vadim Zeitlin [Wed, 3 Jul 2013 00:25:23 +0000 (00:25 +0000)] 
Add wxEventLoopBase::DoRun().

Call it from public Run() after setting the loop as active and resetting
m_shouldExit flag.

No real changes, just cut down on the code duplication among the ports and
make it easier to implement the upcoming changes. see #10258.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoMove wxEventLoopManual::m_shouldExit to wxEventLoopBase.
Vadim Zeitlin [Wed, 3 Jul 2013 00:24:58 +0000 (00:24 +0000)] 
Move wxEventLoopManual::m_shouldExit to wxEventLoopBase.

No real changes, just make this flag available to the other event loop
implementations as they will need it soon.

See #10258.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoAdd "OSX" prefix to wxCFEventLoop::DoRun() and DoStop() methods.
Vadim Zeitlin [Wed, 3 Jul 2013 00:24:34 +0000 (00:24 +0000)] 
Add "OSX" prefix to wxCFEventLoop::DoRun() and DoStop() methods.

Just rename these methods to avoid clashes with DoRun() that will be added to
the base class soon, no real changes.

This is done in preparation for improving nested event loops support, see #10258.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoAdd wxTimer::StartOnce().
Vadim Zeitlin [Wed, 3 Jul 2013 00:24:10 +0000 (00:24 +0000)] 
Add wxTimer::StartOnce().

This is a simple wrapper for wxTimer::Start(timeout, wxTIMER_ONE_SHOT) but is
often more readable and is definitely better than Start(timeout, true) which
many people still use in spite of wxTIMER_ONE_SHOT existence.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoBetter fix for duplicate wxContextMenuEvent generation under MSW.
Vadim Zeitlin [Tue, 2 Jul 2013 20:24:22 +0000 (20:24 +0000)] 
Better fix for duplicate wxContextMenuEvent generation under MSW.

Fix the bug with multiple wxContextMenuEvent being generated for a single
WM_CONTEXTMENU without breaking context menus for wxTextCtrl (and all the
other native controls). Do this by ensuring that WM_CONTEXTMENU is still
passed to DefWindowProc() if we don't process it instead of just being eaten
completely in any case.

Also add a unit test checking for this bug to ensure it stays fixed.

See #13683.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoAvoid forcing wxYield() after wxUIActionSimulator::MouseMove() in wxGTK.
Vadim Zeitlin [Tue, 2 Jul 2013 20:23:58 +0000 (20:23 +0000)] 
Avoid forcing wxYield() after wxUIActionSimulator::MouseMove() in wxGTK.

Yield (for input events only) inside this function itself instead of forcing
all the code using this function to call wxYield() after it as otherwise the
mouse position change is not taken into account by the subsequent simulated
events.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agochain up to parent in dispose handler
Paul Cornett [Tue, 2 Jul 2013 17:15:27 +0000 (17:15 +0000)] 
chain up to parent in dispose handler

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agouse correct signature for class init function
Paul Cornett [Tue, 2 Jul 2013 17:09:55 +0000 (17:09 +0000)] 
use correct signature for class init function

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agouse existing helper to remove inconvenient additional reference added by gtk_tree_mod...
Paul Cornett [Tue, 2 Jul 2013 16:56:42 +0000 (16:56 +0000)] 
use existing helper to remove inconvenient additional reference added by gtk_tree_model_get()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoremove unused function GTKSetItem()
Paul Cornett [Tue, 2 Jul 2013 16:35:43 +0000 (16:35 +0000)] 
remove unused function GTKSetItem()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agopreserve checkbox status in SetString()
Paul Cornett [Tue, 2 Jul 2013 16:29:49 +0000 (16:29 +0000)] 
preserve checkbox status in SetString()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoDon't append extension if it contains wildcards in wxGTK wxFileDialog.
Vadim Zeitlin [Mon, 1 Jul 2013 14:58:27 +0000 (14:58 +0000)] 
Don't append extension if it contains wildcards in wxGTK wxFileDialog.

Restore the test for wildcards erroneously removed in r74307.

Closes #15285.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoOptimize wxImage::Scale() by pre-calculating the values used.
Vadim Zeitlin [Mon, 1 Jul 2013 14:48:24 +0000 (14:48 +0000)] 
Optimize wxImage::Scale() by pre-calculating the values used.

Precompute the values used by various resampling algorithms once instead of
doing it for each pixel. This dramatically speeds them up: more than 3 times
faster in wxImage benchmark with the small images and up to 5 times faster
with larger images.

Closes #15281.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoAdd wxImage::Scale() benchmarks.
Vadim Zeitlin [Mon, 1 Jul 2013 14:48:01 +0000 (14:48 +0000)] 
Add wxImage::Scale() benchmarks.

Measure the time taken to rescale the image to a bigger or smaller size using
normal or high quality.

See #15281.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoAdd benchmarks for wxImage methods.
Vadim Zeitlin [Mon, 1 Jul 2013 14:47:38 +0000 (14:47 +0000)] 
Add benchmarks for wxImage methods.

Build a GUI version of the benchmark program too and use it to benchmark
wxImage loading methods for now (more will be added later).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoAdd a unit test for wxImage::Scale() method.
Vadim Zeitlin [Mon, 1 Jul 2013 14:47:12 +0000 (14:47 +0000)] 
Add a unit test for wxImage::Scale() method.

Check that resizing the test horse image produces the same results in the
future as it does now, by saving the current results in files and verifying
that images resized directly and loaded from these files are the same.

See #15281.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoUse gtk_list_store_insert_with_values() to set entry at same time item is inserted.
Paul Cornett [Mon, 1 Jul 2013 05:10:22 +0000 (05:10 +0000)] 
Use gtk_list_store_insert_with_values() to set entry at same time item is inserted.
This should ensure that the entry is always valid, removing the need for r74315.
Also simplify DoInsertItems() by using DoInsertItemsInLoop().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoFix missing documentation for several GDI functions.
Vadim Zeitlin [Mon, 1 Jul 2013 00:49:46 +0000 (00:49 +0000)] 
Fix missing documentation for several GDI functions.

The documentation for wxGetClientDisplayRect(), wxGetDisplayPPI(),
wxGetDisplaySize() and wxGetDisplaySizeMM() didn't appear in the output
because they were documented as "overloads" of the corresponding functions
without "Get" prefix inside an @addtogroup Doxygen macro and apparently this
is not supported.

Simply document them separately to fix this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agofix assertion failure when string transform is requested before entry is set
Paul Cornett [Sat, 29 Jun 2013 17:16:49 +0000 (17:16 +0000)] 
fix assertion failure when string transform is requested before entry is set

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoForward events to active child in wxMDIParentFrameBase, not only wxMSW.
Vadim Zeitlin [Sat, 29 Jun 2013 12:53:44 +0000 (12:53 +0000)] 
Forward events to active child in wxMDIParentFrameBase, not only wxMSW.

Menu, toolbar and update UI events should be forwarded to the active child
under all platforms in MDI applications and not only MSW, so move TryBefore()
overload from wxMSW wxMDIParentFrame to wxMDIParentFrameBase.

This should make things more consistent in general and notably fixes the lack
of toolbar events in wxDocChildFrame since the changes of r73928.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoFix VC6 compilation of wxRichTextTable code.
Vadim Zeitlin [Sat, 29 Jun 2013 12:53:21 +0000 (12:53 +0000)] 
Fix VC6 compilation of wxRichTextTable code.

In addition to breaking VC6 build, the code also rather strangely declared
"row" inside a for loop first and then declared it in the function scope.

Leave just the second declaration.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoAdd support for horizontal mouse wheel scrolling in wxSTC.
Vadim Zeitlin [Sat, 29 Jun 2013 12:52:58 +0000 (12:52 +0000)] 
Add support for horizontal mouse wheel scrolling in wxSTC.

Handle horizontal mouse wheel scrolling events in a similar (but simpler, as
they always scroll and never change the font size) way to the vertical ones in
wxStyledTextCtrl.

Closes #15266.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoUse more readable wxListCtrl::AppendColumn() in the samples.
Vadim Zeitlin [Sat, 29 Jun 2013 12:52:34 +0000 (12:52 +0000)] 
Use more readable wxListCtrl::AppendColumn() in the samples.

Call this function instead of InsertColumn() with incrementing indices.

See #15265.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoUse wxListColumnFormat for wxListCtrl::AppendColumn() format argument.
Vadim Zeitlin [Sat, 29 Jun 2013 12:52:11 +0000 (12:52 +0000)] 
Use wxListColumnFormat for wxListCtrl::AppendColumn() format argument.

This is safer than using just an untyped int.

Closes #15265.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoFix wxIMAGE_QUALITY_HIGH definition.
Vadim Zeitlin [Sat, 29 Jun 2013 12:51:47 +0000 (12:51 +0000)] 
Fix wxIMAGE_QUALITY_HIGH definition.

Embarrassingly, wxIMAGE_QUALITY_HIGH was never used as it had the same value
as wxIMAGE_QUALITY_BILINEAR due to the changes to these constants in r67203.

After fixing its value in the enum, also change the switch on this enum
elements to avoid g++ warnings about unhandled enum values.

See #12845, #15281.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoFix dnd events in generic wxDataViewCtrl when moving out of the window.
Vadim Zeitlin [Sat, 29 Jun 2013 12:51:24 +0000 (12:51 +0000)] 
Fix dnd events in generic wxDataViewCtrl when moving out of the window.

The wxEVT_DATAVIEW_ITEM_BEGIN_DRAG event wasn't triggered if the mouse moved
below the last item or beyond the last column of a control or left the window
completely.

Fix this by checking for the beginning of the drag before checking for the
mouse being out of items area and also force the drag to start if the mouse is
leaving the window as we would never do it otherwise.

Closes #15258.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoDon't append just a dot in wxGTK wxFileDialog if no default extension.
Vadim Zeitlin [Sat, 29 Jun 2013 12:51:01 +0000 (12:51 +0000)] 
Don't append just a dot in wxGTK wxFileDialog if no default extension.

We always appended the default extension (for the currently selected pattern)
to the file name but this was the wrong thing to do if there was no extension
at all as this resulted in appending just a dot to the filename. So only do it
if there is an extension to append.

Closes #15285.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoAllow resetting background colour of wxHtmlContainerCell.
Vadim Zeitlin [Sat, 29 Jun 2013 12:50:37 +0000 (12:50 +0000)] 
Allow resetting background colour of wxHtmlContainerCell.

Don't use m_UseBkColour flag which remained always set once
SetBackgroundColour() had been called, but just rely on m_BkColour itself
being valid to determine whether we should use it. This allows to reset the
background colour after setting it.

Closes #15287.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoItalian translations update from Roberto Boriotti.
Vadim Zeitlin [Sat, 29 Jun 2013 11:00:13 +0000 (11:00 +0000)] 
Italian translations update from Roberto Boriotti.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoApplied patch #15286: documentation and col/rowspan demo by dghart
Julian Smart [Sat, 29 Jun 2013 10:06:15 +0000 (10:06 +0000)] 
Applied patch #15286: documentation and col/rowspan demo by dghart

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agosupport getting device resolution on all osx ports
Stefan Csomor [Fri, 28 Jun 2013 13:24:27 +0000 (13:24 +0000)] 
support getting device resolution on all osx ports

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agonew method for contentScaleFactor on main screen
Stefan Csomor [Fri, 28 Jun 2013 10:41:20 +0000 (10:41 +0000)] 
new method for contentScaleFactor on main screen

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agonew method for contentScaleFactor on main screen
Stefan Csomor [Thu, 27 Jun 2013 12:48:46 +0000 (12:48 +0000)] 
new method for contentScaleFactor on main screen

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agonative bitmap scaling codes
Stefan Csomor [Thu, 27 Jun 2013 07:24:15 +0000 (07:24 +0000)] 
native bitmap scaling codes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agouse correct scale when drawing
Stefan Csomor [Thu, 27 Jun 2013 05:54:51 +0000 (05:54 +0000)] 
use correct scale when drawing

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoadding impls to wxBitmap on msw as this doesn't inherit from base - Thanks Vaclav!
Stefan Csomor [Tue, 25 Jun 2013 17:37:17 +0000 (17:37 +0000)] 
adding impls to wxBitmap on msw as this doesn't inherit from base - Thanks Vaclav!

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoadding default for Create with dc
Stefan Csomor [Tue, 25 Jun 2013 17:15:10 +0000 (17:15 +0000)] 
adding default for Create with dc

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoincomplete paste error
Stefan Csomor [Tue, 25 Jun 2013 16:28:25 +0000 (16:28 +0000)] 
incomplete paste error

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoadding default impl for CreateScaled
Stefan Csomor [Tue, 25 Jun 2013 16:25:32 +0000 (16:25 +0000)] 
adding default impl for CreateScaled

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agovirtual method hiding in GTK, so add direct implementation
Stefan Csomor [Tue, 25 Jun 2013 15:41:23 +0000 (15:41 +0000)] 
virtual method hiding in GTK, so add direct implementation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoApplied rowspan patch #15276 (dghart)
Julian Smart [Tue, 25 Jun 2013 15:38:46 +0000 (15:38 +0000)] 
Applied rowspan patch #15276 (dghart)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoApplied colspan corrections, #15274 and #15275 (dghart)
Julian Smart [Tue, 25 Jun 2013 15:30:55 +0000 (15:30 +0000)] 
Applied colspan corrections, #15274 and #15275 (dghart)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agosupport retina display
Stefan Csomor [Tue, 25 Jun 2013 15:11:18 +0000 (15:11 +0000)] 
support retina display

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agousing dc Create for bitmap, for retina support
Stefan Csomor [Tue, 25 Jun 2013 14:57:14 +0000 (14:57 +0000)] 
using dc Create for bitmap, for retina support

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoAllow for older GTK+ versions
Julian Smart [Tue, 25 Jun 2013 14:55:48 +0000 (14:55 +0000)] 
Allow for older GTK+ versions

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agosupport for scaled bitmaps in wxMemoryDC
Stefan Csomor [Tue, 25 Jun 2013 14:19:41 +0000 (14:19 +0000)] 
support for scaled bitmaps in wxMemoryDC

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agonative scaling support for bitmap
Stefan Csomor [Tue, 25 Jun 2013 14:02:11 +0000 (14:02 +0000)] 
native scaling support for bitmap

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agofixing naming to GetScaleFactor, adding default Create with a dc parameter
Stefan Csomor [Tue, 25 Jun 2013 13:54:15 +0000 (13:54 +0000)] 
fixing naming to GetScaleFactor, adding default Create with a dc parameter

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agodefault implementation for scaled bitmaps properties
Stefan Csomor [Tue, 25 Jun 2013 13:21:20 +0000 (13:21 +0000)] 
default implementation for scaled bitmaps properties

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agosupporting native content scaling on OSX
Stefan Csomor [Tue, 25 Jun 2013 12:43:44 +0000 (12:43 +0000)] 
supporting native content scaling on OSX

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoformatting
Stefan Csomor [Tue, 25 Jun 2013 12:26:11 +0000 (12:26 +0000)] 
formatting

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoadding ContentScaleFactor support to dc - defaulting to 1.0
Stefan Csomor [Tue, 25 Jun 2013 12:24:34 +0000 (12:24 +0000)] 
adding ContentScaleFactor support to dc - defaulting to 1.0

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoRemoved 3D style for splitter on Mac since it looks bad
Julian Smart [Tue, 25 Jun 2013 07:23:48 +0000 (07:23 +0000)] 
Removed 3D style for splitter on Mac since it looks bad

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoAdd wxBookCtrlBase::DoSetSelectionAfterRemoval() and use it in wxSimplebook.
Vadim Zeitlin [Sun, 23 Jun 2013 16:39:39 +0000 (16:39 +0000)] 
Add wxBookCtrlBase::DoSetSelectionAfterRemoval() and use it in wxSimplebook.

This fixes the wrong handling of the selection in wxSimplebook when the
currently selected page was deleted.

Also extend the unit tests to check for this bug.

Closes #15188.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoNo real changes, just simplify wxBookCtrlBase unit test a little.
Vadim Zeitlin [Sun, 23 Jun 2013 16:39:15 +0000 (16:39 +0000)] 
No real changes, just simplify wxBookCtrlBase unit test a little.

Add Realize() virtual function that can be overridden in ToolbookTestCase
instead of using explicit wxDynamicCasts.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoAdd a minimal unit test for wxSimplebook.
Vadim Zeitlin [Sun, 23 Jun 2013 16:38:51 +0000 (16:38 +0000)] 
Add a minimal unit test for wxSimplebook.

This is just a test running the common wxBookCtrlBase tests for wxSimplebook.

See #15188.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoAlso propagate wxEVT_UPDATE_UI to the child MDI frame.
Vadim Zeitlin [Sun, 23 Jun 2013 13:08:41 +0000 (13:08 +0000)] 
Also propagate wxEVT_UPDATE_UI to the child MDI frame.

It seems to make sense to handle wxEVT_UPDATE_UI in the same way as wxEVT_MENU
as they are often used together. This allows to handle e.g. toolbar buttons
entirely in the child MDI frame, without any involvement from the parent.

See #14314.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoUse child MDI frame menu items in preference to the parent frame ones.
Vadim Zeitlin [Sun, 23 Jun 2013 13:08:18 +0000 (13:08 +0000)] 
Use child MDI frame menu items in preference to the parent frame ones.

Look for the item with the given ID in the child frame menu bar first, before
looking in the parent frame menu bar. This ensures that if an item is disabled
by the parent frame but then reenabled by the child one, it still generates
commands as expected instead of being completely ignored.

See #14314.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoUndo "Forward events to active child at MSW, not wx, level in wxMDIParentFrame."
Vadim Zeitlin [Sun, 23 Jun 2013 13:07:55 +0000 (13:07 +0000)] 
Undo "Forward events to active child at MSW, not wx, level in wxMDIParentFrame."

Unfortunately, forwarding MSW messages only takes care of the menu events but
not the toolbar ones -- which should be handled in the same way but were not.

So restore the old behaviour, the problem with menu items disabled in the
parent frame but enabled in the child one will be fixed differently.

This reverts r73927.

See #14314.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoAdd --without-libjbig and --without-liblzma configure switches.
Vadim Zeitlin [Sun, 23 Jun 2013 11:10:03 +0000 (11:10 +0000)] 
Add --without-libjbig and --without-liblzma configure switches.

They can be used to disable the use of the corresponding libraries by the
built-in libtiff.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoAdd WX_ATTRIBUTE_UNUSED and use it for typedefs to avoid g++ 4.8 warnings.
Vadim Zeitlin [Sun, 23 Jun 2013 00:53:15 +0000 (00:53 +0000)] 
Add WX_ATTRIBUTE_UNUSED and use it for typedefs to avoid g++ 4.8 warnings.

g++ 4.8 warns about unused typedef's in local scope resulting in hundreds of
warnings when building wx, suppress them by using WX_ATTRIBUTE_UNUSED for
these typedefs.

Closes #15137.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoFix Unix build with libSDL 2 in debug mode.
Vadim Zeitlin [Fri, 21 Jun 2013 09:21:58 +0000 (09:21 +0000)] 
Fix Unix build with libSDL 2 in debug mode.

SDL_AudioDriverName() was replaced with SDL_GetCurrentAudioDriver() in SDL v2.

Closes #15271.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoNot not pass debug messages on from wxLogWindow.
Steve Lamerton [Thu, 20 Jun 2013 14:40:57 +0000 (14:40 +0000)] 
Not not pass debug messages on from wxLogWindow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agopartial revert, as we still need Xcode 3.1 for 10.5, Xcode 3.2 is 10.6+ only
Stefan Csomor [Thu, 20 Jun 2013 07:22:00 +0000 (07:22 +0000)] 
partial revert, as we still need Xcode 3.1 for 10.5, Xcode 3.2 is 10.6+ only

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoupdate Xcode format
Stefan Csomor [Thu, 20 Jun 2013 07:13:44 +0000 (07:13 +0000)] 
update Xcode format

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agocommon schemes, Xcode 4/5 updates
Stefan Csomor [Thu, 20 Jun 2013 07:09:27 +0000 (07:09 +0000)] 
common schemes, Xcode 4/5 updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agocommon schemes
Stefan Csomor [Thu, 20 Jun 2013 07:08:21 +0000 (07:08 +0000)] 
common schemes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoupdated project files
Stefan Csomor [Thu, 20 Jun 2013 06:54:55 +0000 (06:54 +0000)] 
updated project files

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoGetMagnificationFactor --> GetContentScaleFactor
Robin Dunn [Thu, 20 Jun 2013 01:02:49 +0000 (01:02 +0000)] 
GetMagnificationFactor --> GetContentScaleFactor

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoAdd flags for SendSizeEvent
Robin Dunn [Thu, 20 Jun 2013 01:02:20 +0000 (01:02 +0000)] 
Add flags for SendSizeEvent

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agoDocument wxWindow::GetMagnificationFactor
Robin Dunn [Thu, 20 Jun 2013 01:01:51 +0000 (01:01 +0000)] 
Document wxWindow::GetMagnificationFactor

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agofixing iPhone build
Stefan Csomor [Wed, 19 Jun 2013 20:30:54 +0000 (20:30 +0000)] 
fixing iPhone build

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agousing common GetContentScaleFactor throughout part 2/2
Stefan Csomor [Wed, 19 Jun 2013 20:29:56 +0000 (20:29 +0000)] 
using common GetContentScaleFactor throughout part 2/2

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

11 years agousing common GetContentScaleFactor throughout part 1
Stefan Csomor [Wed, 19 Jun 2013 20:28:01 +0000 (20:28 +0000)] 
using common GetContentScaleFactor throughout part 1

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775