Commit Graph

160 Commits

Author SHA1 Message Date
Vadim Zeitlin
49b489e80f Fix erasing wxHtmlWindow background in wxUniv.
Prevent the default wxWindow-level wxEVT_ERASE_BACKGROUND handler from being
used in wxUniv for wxHtmlWindow. This is unnecessary as it has its own handler
anyhow and also doesn't work for some reason as erasing wxMemoryDC by drawing
a solid rectangle over it seems to be broken in at least wxX11.

Work around this problem by erasing the background in wxHtmlWindow itself if
no user-defined (as opposed to any, including one defined in wxWindow itself)
handler for this event exists.

Closes #13880.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-28 22:24:43 +00:00
Václav Slavík
fca74306c5 Don't eat unhandled events in wxHtmlWindow::OnKeyUp().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-07 16:15:11 +00:00
Vadim Zeitlin
615f68c6b9 Skip EVT_RIGHT_UP event in wxHtmlWindow if it wasn't handled.
This fixes generation of EVT_CONTEXT_MENU for mouse clicks in wxHtmlWindow
under MSW: it wasn't generated before because we always ate the right mouse
clicks.

Closes #2465.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-01-18 23:12:03 +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
Dimitri Schoolwerth
4c51a665c6 Fixed various typos.
Applied patch by snowleopard2 fixing a bunch of typos such as misspellings and double words in the documentation. Combined the patch with some local queued typos waiting to be committed as well as adding new typo fixes inspired by the patch.

Function names with American spelling were not changed nor was third-party code touched. The only code changes involve some changes in strings that are translated ("Can not" -> "Cannot").

Closes #13063 (again).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-22 14:17:38 +00:00
Stefan Csomor
2895324520 merging back XTI branch part 2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 08:31:53 +00:00
Vadim Zeitlin
88ed20a2fa Propagate wxHtmlWindow layout direction to the wxDC it uses.
While wxHtmlWindow doesn't support mixing LTR and RTL contents we can indeed
try to make it render pure RTL stuff correctly by setting up the wxDC used for
drawing accordingly.

Closes #1988.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-23 23:33:23 +00:00
Vadim Zeitlin
5276b0a53c Use wxDELETE() and wxDELETEA() when possible.
Use wxDELETE[A]() functions which automatically NULL out their arguments after
deleting them instead of doing it manually.

Closes #9685.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-20 18:18:23 +00:00
Vadim Zeitlin
b42468496c Compilation fixes in wxHTML for wxUSE_CONFIG==0.
Surround uses of wxConfig with #of wxUSE_CONFIG in wxHTML code.

Closes #11750.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-02-25 00:03:30 +00:00
Václav Slavík
a7b2c092b7 Fix wxHtmlWindow to correctly decide whether to show scrollbars.
wxHtmlWindow::CreateLayout()'s algorithm was both naive (not properly
accounting for scrollbar visibility changes during layout) and broken
(incorrectly rounding when computing scroll steps and adding
GetCharHeight() value to the height in an attempt to mitigate the
harm).

This algorithm should properly for scrollbars in all situations.
Rounding is done in such way that the content is fully viewable, while
at the same time not showing scrollbars needlessly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-02-14 15:27:42 +00:00
Václav Slavík
8e6c2840b4 Improved handling of anchors in wxHTML: scroll to better position (patch #11406).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-11-17 20:20:48 +00:00
Vadim Zeitlin
a3873c6f9c Revert "trivial" change of r61772.
The "slight code simplification" of r61772 broke the code as it could now
crash if dangling m_Cell pointer was used during parsing. Revert it and add a
comment explaining why the code is written in the way it is.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-11-04 16:15:52 +00:00
Julian Smart
8e494db90c Set the initial size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-10 11:02:01 +00:00
Vadim Zeitlin
1c51fc784d No real changes, just slightly simplify code.
No need to check whether the pointer is NULL before deleting it nor to assign
NULL to it if it's going to be immediately reassigned on the next line.

Closes #11149.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-08-28 10:43:51 +00:00
Vadim Zeitlin
9a83f86094 Globally replace _T() with wxT().
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-23 20:30:22 +00:00
Vadim Zeitlin
03a187ccae wxHtmlWindow background drawing fixes for OS X and optimizations
1. Avoid crashes under OS X due to attempts to copy window contents to the
   backing store bitmap: this doesn't work under OS X so avoid it by always
   painting the background from OnPaint() itself, while still generating the
   erase background events for compatibility.

2. Don't double buffer wxHtmlWindow drawing if the window is already double
   buffered.

3. Don't allocate backing store bitmap on the heap, this is useless as bitmaps
   are already pointer-lile -- so just use invalid bitmap instead of NULL
   bitmap pointer.

4. Update the html/test sample to show the effects of custom erase background
   handler in wxHtmlWindow (it overrides the background bitmap painting).



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-18 17:32:20 +00:00
Vadim Zeitlin
6528a7f145 make wxWindow::SetAutoLayout() now works for all windows, not just panels
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-23 11:26:58 +00:00
Vadim Zeitlin
c0c133e13b add wx-prefixed and semicolon-requiring versions of DECLARE_NO_{COPY,ASSIGN}_CLASS macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-08 11:45:59 +00:00
Vadim Zeitlin
9b11752c4f require semicolon after wxDECLARE/DEFINE_EVENT() (closes #10456)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-07 18:59:25 +00:00
Vadim Zeitlin
3c77890141 add more flexible and safer template Connect() overloads (#10000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-12 14:26:13 +00:00
Václav Slavík
7f8f381c0f fixed wxHtmlWindow::SelectionToText() to correctly insert newlines after single-cell paragraphs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-15 15:43:45 +00:00
Václav Slavík
82a4610423 PCH-less compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-05 15:05:52 +00:00
Václav Slavík
37146d3352 added wxHtmlWindow::SetRelatedStatusBar(wxStatusBar*) (patch #9235 by troelsk)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-05 09:38:37 +00:00
Vadim Zeitlin
e4e487e2a5 no real changes, just simplify LoadPage() to make it more readable and less redundant
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-05-31 13:25:50 +00:00
Vadim Zeitlin
179a30e2f8 check that the argument is not empty in wxHtmlWindow::LoadPage() to avoid crashing if it is
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-05-30 19:49:53 +00:00
Paul Cornett
04ee05f92a fix a huge number of build errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-17 18:26:00 +00:00
Václav Slavík
f1edd54c39 clear statusbar 'Connecting...' message on failure
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-28 22:50:03 +00:00
Vadim Zeitlin
bc0e68ebaf calling SetFocus() in OnMouseUp() is unnecessary if we skip the event in OnMouseDown()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-22 11:35:19 +00:00
Václav Slavík
907f2fabf7 Do not follow HTML links if selecting text (patch #1719577)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-16 07:17:11 +00:00
Václav Slavík
b4f4d3dd61 WX_PRECOMP, not WXPRECOMP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-27 21:35:43 +00:00
Vadim Zeitlin
33c2a4b7e2 call SetEventObject() for wxHtmlLinkEvents we generate
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-04 02:00:32 +00:00
Vadim Zeitlin
0f11c23345 generate wxEVT_COMMAND_TEXT_COPY event in wxHtmlWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-30 16:18:45 +00:00
Václav Slavík
a1c3cdc4a2 add events API to wxHtmlWindow (patch #1504493 by Francesco Montorsi)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-29 20:26:03 +00:00
Vadim Zeitlin
cc87fbed40 removed wxHtmlWindow::m_Style which duplicated wxWindow::m_windowStyle and prevented changeing wxHW_XXX window style after Create() from working
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-10 15:46:49 +00:00
Václav Slavík
63e819f298 added wxEVT_MOUSE_CAPTURE_LOST event and code for correctly handling capture loss (bug #1153662)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-31 09:27:54 +00:00
Włodzimierz Skiba
28f92d74ee Include wx/dataobj.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-27 12:57:16 +00:00
Włodzimierz Skiba
80d9952564 Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-04 19:49:08 +00:00
Włodzimierz Skiba
9eddec696f Include wx/settings.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-24 07:16:32 +00:00
Włodzimierz Skiba
c0badb709a Include wx/timer.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-23 11:04:37 +00:00
Julian Smart
689f42f4b4 Documentation states scrollbars (plural) are switched off by wxHW_SCROLLBAR_NEVER,
so make sure this is true, even if the layout erroneously wants to create
a horizontal scrollbar.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-17 16:32:11 +00:00
Włodzimierz Skiba
f38924e863 Include wx/dcmemory.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-08 07:58:37 +00:00
Włodzimierz Skiba
8ecff18117 Include wx/list.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-20 07:31:44 +00:00
Włodzimierz Skiba
93763ad5ba wx/wxprec.h already includes wx/defs.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 08:11:26 +00:00
Václav Slavík
88a1b6485f don't show the I-beam cursor over text in wxHtmlListBox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 11:38:36 +00:00
Václav Slavík
bc55e31bdc 1. added abstract interface to wxHtmlWindow for use by wxHtmlWinParser and implemented it for wxHtmlListBox
2. used the above to implement clickable links support in wxHtmlListBox


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-13 22:08:28 +00:00
Vadim Zeitlin
0cc70962a1 Made wxList::compatibility_iterator a class in wxUSE_STL == 0 case too instead
of a simple typedef to "Node *" to be able to initialize it with NULL in ctor
which makes the behaviour of the code with and without wxUSE_STL the same.


The price to pay is that the code like

	wxList:compatibility_iterator ci;
	ci = cond ? list->GetFirst() : wxList::compatibility_iterator();

doesn't compile any more and has to be replaced with (more clear anyhow)

	wxList:compatibility_iterator ci;
	if ( cond )
		ci = list->GetFirst();


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 14:05:11 +00:00
Václav Slavík
73de5077ce preserve window's content when changing the fonts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 18:31:49 +00:00
Vadim Zeitlin
abe64011cd use Cmd-C under Mac to copy text, not Ctrl-C
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 16:47:42 +00:00
Vadim Zeitlin
17a1ebd101 first round of Intel compiler warning fixes: down from a few thousands just to slightly more than 100
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 19:59:19 +00:00
Vadim Zeitlin
fbfb8bcc3f added missing consts and pass objects by const reference instead of by value (patch 1205869)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-24 21:43:15 +00:00