Commit Graph

30317 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
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
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
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
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
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
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
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
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
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
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
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
Paul Cornett
701871dc87 check for self-assignment in operator=
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-25 01:01:26 +00:00
Paul Cornett
ababdf5ffd copy array with memcpy rather than a loop
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-25 00:59:45 +00:00
Paul Cornett
46a1983ae4 use int instead of size_t for a couple member variables
it's simpler, and there is no point in using size_t anyway since they are assigned from ints

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-25 00:52:24 +00:00
Vadim Zeitlin
35ee173d0f Fix crash in wxTreeListCtrl::GetItemText() if text was never set.
Asking for the text of an item is not an error even if it was never set for
any column but the first one so just return an empty string in this case
instead of crashing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-23 23:58:54 +00:00
Paul Cornett
0f31a78f36 remove redundant GTK-specific code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-23 17:21:06 +00:00
Václav Slavík
a2a4e18c10 Make generic wxDataViewCtrl rows a bit taller.
They now use the same height that Windows 7's Explorer uses. This makes
more inline editor controls fit comfortably.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-23 13:43:04 +00:00
Vadim Zeitlin
6e043ba946 Dismiss wxSplashScreen on any user input, not necessarily on splash itself.
Use wxEventFilter to remove the splash screen as soon as any user input is
detected anywhere in the application, not necessarily over the splash screen
itself.

This ensures that the splash screen disappears as soon as the user starts
working with the application instead of sticking around and covering the main
window.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-22 13:18:55 +00:00
Vadim Zeitlin
7650eed409 Ensure that wxSplashScreen doesn't appear on taskbar nor in Alt-TAB list.
Having the splash screen in Alt-TAB window list under MSW was useless and ugly
(as it didn't even have the proper application icon) so use the appropriate
styles to avoid this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-22 13:18:53 +00:00
Vadim Zeitlin
58cc15871d Add wxEventFilter and related functionality.
Allow defining event filters to globally pre-process all application events
without having to override wxApp::FilterEvent().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-22 13:18:50 +00:00
Vadim Zeitlin
feb32e3165 Hack wxMSW wxNotebook to show the text controls correctly initially.
Add an Update() call to ensure that text controls in the initially selected
notebook page are shown correctly. It's almost certainly not the right fix for
the real bug that results in text controls not being shown when the notebook
comes up but it doesn't cost much and at least allows us to get correct
appearance for the themed notebooks.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-22 13:18:45 +00:00
Vadim Zeitlin
ec90f7158e Fix HasFocus() for composite controls.
Comparing the result of DoFindFocus() with the main window of composite
control doesn't work as it can return a child window so HasFocus() still
returned false for a composite control such as generic wxListCtrl even when it
did have focus.

Just use FindFocus() instead of DoFindFocus() to fix this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-18 23:40:53 +00:00
Vadim Zeitlin
60eabdbebf No changes, just remove extra whitespace from wxWebViewIE code.
Closes #13678.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-18 23:40:24 +00:00
Steve Lamerton
40fab879f0 Remove double buffering from wxWebViewIE as this is handled by the web browser control itself and actually makes flickering worse. Also remove an unnecessary background style.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-17 20:43:34 +00:00
Steve Lamerton
1ce077e25b Adjust testing for non-visible controls in wxActiveXContainer.
Fixes  #13659

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-17 20:39:44 +00:00
Robin Dunn
a0ff361188 Don't include webkit headers from wx headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-17 01:23:03 +00:00
Vadim Zeitlin
f559d1a23c Move wxWebView-related definitions to webview_ie.cpp and fix them.
Ensure that all the GUIDs are defined by including initguid.h to fix linking
error with most versions of MinGW.

Use "wx" prefix to avoid clashes with the standard GUIDs if they do happen to
be defined.

Closes #13645.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-16 23:45:22 +00:00