Commit Graph

54208 Commits

Author SHA1 Message Date
Paul Cornett
36307fdf51 remove unused variables
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-01 08:16:42 +00:00
Paul Cornett
612633432a add test for bug fixed in r69878
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-01 08:08:24 +00:00
Paul Cornett
0f29501b66 Fix crash when appending menuitem after removing it from another menu.
Also remove unused return value from GtkAppend

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-01 06:57:44 +00:00
Vadim Zeitlin
516ed23a94 Fix setting the parent of wxProgressDialog.
Don't call GetParentForModalDialog() with wxProgressDialog style, this doesn't
work as it expects the window style.

Do call SetParent() when using the native MSW implementation as the wx-level
parent is not used then.

Closes #13706.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-30 10:48:05 +00:00
Vadim Zeitlin
37bea8d229 Don't include all wx/xxx/webviewhistoryitem_xxx.h headers.
Only one of these headers is available for each platform so include at most
one of them.

Closes #13705.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-30 10:21:43 +00:00
Vadim Zeitlin
99644bf127 Include wx/defs.h, not wx/setup.h from wx/webview.h for consistency.
All wx headers start by including wx/defs.h so do it in wx/webview.h as well
even if wx/setup.h was sufficient in this particular case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-30 10:21:40 +00:00
Vadim Zeitlin
a3d73e4c09 Document more wxCommandProcessor methods.
Document CanRedo(), Store() and GetCurrentCommand().

Closes #13700.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-30 09:21:37 +00:00
Vadim Zeitlin
2f0bebe646 Use more clear names for variables in wxHtmlSelection code.
Call the variables and related methods "character position" instead of
"private position" which wasn't very clear.

Closes #13307.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-30 09:21:33 +00:00
Vadim Zeitlin
35ce2b44b5 Remove unused variable from wxWebViewWebKit code in wxGTK.
g++ correctly warned about a variable being set but never used, just remove
it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-30 09:16:48 +00:00
Vadim Zeitlin
f0776dc43f Fix wxWebView compilation in STL build with wxGTK.
Convert wxString to GTK+ strings explicitly, implicit conversion doesn't
happen in STL build and may be wrong anyhow as it doesn't necessarily convert
the strings to UTF-8 expected by GTK+.

Closes #13703.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-30 09:16:44 +00:00
Vadim Zeitlin
d9fc8e993a Make wxMSW status bar slightly less tall by default.
The status bar in wxMSW applications was too big under Windows 7 because it
used EDIT_HEIGHT_FROM_CHAR_HEIGHT() to calculate the height which was simply
unwarranted here. Instead, make the status bar tall enough to accommodate
simple text contents by default and fix SetMinHeight() to actually work for
the cases when a taller toolbar is needed.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-30 00:52:34 +00:00
Vadim Zeitlin
f1a6c1d024 Don't include pbt.h from wxMSW code unnecessarily.
The contents of this header is available from winuser.h (included by
windows.h) since at least 15 years and pbt.h itself is not included in the
latest Platform SDK releases (8+) so simply don't include it and also don't
test for its availability in configure.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-29 19:27:14 +00:00
Steve Lamerton
8a4e043aef Override MSWTranslateMessage for wxActiveXContainer. Calling IOleInPlaceActiveObject::TranslateAccelerator ensures that accelerators and other keyboard functionality behaves correctly.
Fixes #13679.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 20:19:16 +00:00
Vadim Zeitlin
6c5cc8a075 Override GetMainWindowOfCompositeControl() in wxGrid subwindows.
This is necessary for HasFocus() to work correctly for them since the changes
of r69788.

Closes #13686.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 19:15:59 +00:00
Vadim Zeitlin
202388d3bc Correct HasFocus() to work with subwindows of a composite control.
When a subwindow (i.e. one that overrides GetMainWindowOfCompositeControl() to
return a parent window) has focus, HasFocus() should return true for it too,
in addition to returning true for the main window.

This completes the fix of r69788.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 19:15:57 +00:00
Vadim Zeitlin
4e2b91bb27 Extend wxBannerWindow background bitmap if necessary.
Ensure that the entire banner window uses the same background colour as the
bitmap, even when the bitmap is too small for the window size. This allows to
avoid using huge bitmaps if extending the bitmap with solid colour looks good
enough.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 18:58:52 +00:00
Vadim Zeitlin
e78e77e5ca Added instructions about building applications using wxMSW.
Explaining how to build wxWidgets itself is insufficient as usually people
want to actually build their programs using it and not just the library
itself, so add a section explaining how to build the projects using wxMSW.

Also add a table of contents and mention that MSVC and g++ are the main
supported compilers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 14:16:03 +00:00
Vadim Zeitlin
836499118f Ignore WXK_NONE events in wxStyledTextCtrl.
Scintilla use of 0 indicating "modifier key" conflicts with our use of
WXK_NONE indicating absence of a valid key code. As Scintilla can't do
anything with the keys without a key code anyhow, simply ignore them
immediately, without passing them to Scintilla, in DoKeyDown().

This fixes handling of IME input in wxStyledTextCtrl under MSW and possibly
other problems (e.g. with dead char keys).

Closes #13570.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 13:34:16 +00:00
Vadim Zeitlin
1d8d3cc5a1 Add support for custom numeric formats to wxGrid.
Allow %e and %g formats (as well as their upper-letter equivalents) in
addition to the default %f format for number display in wxGrid.

Closes #13583.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 13:23:33 +00:00
Vadim Zeitlin
09c0ebcf96 Don't hardcode the number of toolbar tools in the toolbar sample.
Use GetToolsCount() instead of the hardcoded 10 (which can be wrong if any
tools were added or removed).

See #13673.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 12:47:26 +00:00
Vadim Zeitlin
c66c8042ad Corrected handling of wxTB_HORZ_TEXT in the toolbar sample.
The value of flag could be lost when toolbar was recreated without using text
at all.

Closes #13572.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 12:47:23 +00:00
Stefan Csomor
1165fdbbe2 supporting rawctrl strings, fixes #13496, rawctrl is correctly interpreted for all platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 10:24:13 +00:00
Dimitri Schoolwerth
798ada3dc8 Regenerated Xcode projects.
Updated the Xcode projects to include src/common/time.cpp.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 06:02:52 +00:00
Paul Cornett
8f81f01db3 update _GOptionGroup check
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 05:11:27 +00:00
Paul Cornett
514b0e137e build fixes for Universal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 05:00:09 +00:00
Paul Cornett
f423075391 don't warn about gnomeprint if we already have gtkprint
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-28 04:51:51 +00:00
Paul Cornett
3fb71b017d don't require gconf-2.0, we don't use it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 22:59:26 +00:00
Vadim Zeitlin
2abc54ca70 Include wx/time.h to get wxLocaltime_r() declaration, not wx/datetime.h.
Also remove wxUSE_DATETIME guard, wxLocaltime_r() is available even without
wxUSE_DATETIME.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 20:28:45 +00:00
Vadim Zeitlin
fb7ce3e8cc No changes, just moved wxLocaltime_r() and wxGmtime_r() to wx/time.h.
These functions are used by wxGetTimeZone() defined in time.cpp and so need to
be available from wx/time.h. This is also the most logical place for them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 20:28:43 +00:00
Vadim Zeitlin
603c73dbba Implement wxStackWalker for wxMSW under x86-64.
Use 64 bit debug help functions instead of 32 bit ones and add code for
dealing with x86-64 stack frames.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:52:13 +00:00
Vadim Zeitlin
fc4070fc9d Add support for VK_OEM_102 key under wxMSW.
This is the "<>|" key on German keyboard and is also used in many other
layouts so failing to handle it resulted in not receiving EVT_KEY_XXX events
for these keys in wxWidgets programs.

Closes #13558.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:53 +00:00
Vadim Zeitlin
b4c0df15e0 Set Unicode key code correctly for key events for WXK_RETURN in wxMSW.
WXK_RETURN is an ASCII character so return it from wxKeyEvent::GetUnicodeKey()
for EVT_KEY_{DOWN,UP} events, especially as it was already done for EVT_CHAR
ones.

See #13558.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:49 +00:00
Vadim Zeitlin
e65ae1d36d Change value of wxHELP to avoid clash with wxSTAY_ON_TOP.
Using wxSTAY_ON_TOP with wxMessageDialog resulted in "Help" button appearing
since r68537 because these two constants had the same numeric value.

Avoid this by changing wxHELP value to be the same as wxCLOSE_BOX instead: the
latter can't be used with wxMessageDialog so this should solve the problem,
even if there are still conflicts. Also adjust the other button constants
values to account for wxHELP change.

Closes #13433.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:45 +00:00
Vadim Zeitlin
796e54ef37 Use wxGetUTCTimeUSec() in wxStopWatch under Unix for higher precision.
If gettimeofday() is available we can achieve better than millisecond
precision (even if it usually isn't as high as microsecond), so use it as
clock source in wxStopWatch.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:42 +00:00
Vadim Zeitlin
e16458826d Use wxGetUTCTimeMillis() instead of wxGetLocalTimeMillis() in wxStopWatch.
Using local time meant that wxStopWatch didn't work reliably around DST
changes. It also was completely unnecessary, just use the UTC clock instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:35 +00:00
Vadim Zeitlin
cec1b1ab0b Removed private wxGetLocalTimeUsec() function from Unix code.
The function was badly named as it returned UTC time and not local time and
can be simply replaced with the just added public wxGetUTCTimeUSec().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:33 +00:00
Vadim Zeitlin
173a5ddc77 No changes, just move time functions from wx/stopwatch.h to wx/time.h.
Preserve compatibility by including wx/time.h from wx/stopwatch.h but put all
the time-related functions in a more logical place.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:27 +00:00
Vadim Zeitlin
a43503cb8d Added wxGetUTCTimeMillis() and wxGetUTCTimeUSec().
Fixed wxGetLocalTimeMillis() to really return the local time and provide
wxGetUTCTimeMillis() doing what this function used to do before. Closes #13610.

Also add wxGetUTCTimeUSec() for even higher resolution time stamps as it is
basically the same as wxGetUTCTimeMillis() anyhow, at least for MSW and
non-ancient Unix systems providing gettimeofday().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:23 +00:00
Vadim Zeitlin
59068d79f7 Extracted private GetTimeZone() to public wxGetTimeZone() function.
Created new wx/time.h header for this function, more time-related functions
will be added to it later.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:19 +00:00
Vadim Zeitlin
b0ec002323 Added wxStopWatch::TimeInMicro() for better precision time measurement.
Also simplify/streamline wxStopWatch implementation and replace confusingly
named m_pause with more clear m_elapsedBeforePause.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:12 +00:00
Vadim Zeitlin
54647bb750 Use ::QueryPerformanceCounter() for wxStopWatch implementation in wxMSW.
QueryPerformanceCounter() provides higher resolution and precision for
measuring time under MSW, even though it suffers from some problems in older
Windows versions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:08 +00:00
Vadim Zeitlin
c439998525 Use shorter sleep times in wxStopWatch unit test.
Make wxStopWatchTestCase::Misc() run in 2.5 seconds instead of 7. This not
only makes the test run faster but allows us to test wxMilliSleep() and
precision of wxStopWatch for time periods in fractional seconds.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:05 +00:00
Vadim Zeitlin
e76e89aabe Correct wxTLS_PTR definition for !wxHAS_COMPILER_TLS case.
wxTLS_PTR should have type of "T*" instead of being simply usable as "T*"
because of its overloaded operator->(), otherwise the code relying on it being
"T*" and compiling without problems in wxHAS_COMPILER_TLS case could fail to
compile without compiler TLS support.

Closes #13644.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:01 +00:00
Vadim Zeitlin
2d5779d440 Don't hide/show wxActiveXContainer when resizing it.
This results in bad flicker as can be seen with wxWebView or wxMediaCtrl and
just doesn't seem to be necessary.

Closes #13680.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:49:58 +00:00
Vadim Zeitlin
b29bd6b44f Don't crash when changing label of label-less wxToggleButton in wxGTK.
If a button doesn't show any text label, simply don't do anything when
SetLabel() is called instead of replacing the image shown by the button with a
text label as the button doesn't expect this to happen and doing it breaks its
assumptions about the widgets it has and results in assert failures later.

Closes #13693.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:49:54 +00:00
Vadim Zeitlin
d8991cbffe Include webview library headers in the list of all headers.
Due to a typo in files.bkl (${...} was used instead of $(...) so the variable
didn't get really dereferenced), the web view headers were not included in the
list of all headers and hence not installed by "make install" under Unix.

Closes #13690.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:49:48 +00:00
Vadim Zeitlin
b82f92a80c Merge similar but not quite identical translated strings.
Some translated strings appeared several times in almost but not quite
identical form. Remove a few of them so that they don't have to be translated
multiple times.

Closes #13637.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:49:43 +00:00
Vadim Zeitlin
167d0cb30b Define wxCURSOR_DEFAULT_TYPE correctly for the old Cocoa port.
Closes #13652.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:49:33 +00:00
Dimitri Schoolwerth
9c0d9ce328 merged libpng 1.5.6 to trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-25 22:25:11 +00:00
Václav Slavík
0fdeaabe4d Account for indentation in wxDataViewCtrl::GetBestColumnWidth().
Generic control only accounted for actual content, but didn't consider
indentation level when calculating width of the expander column.

Fixes #13629.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-25 18:11:16 +00:00