Commit Graph

77 Commits

Author SHA1 Message Date
Paul Cornett
9ff9d30c0a Hold a reference on m_widget for the life of the associated wxWindow object.
This allows removing some ugly hacks, and leaking of GtkWidgets by wxNotebook.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-26 16:19:23 +00:00
Robert Roebling
88684daa70 gtk wxStaticText and wxALIGN_CENTER_VERTICAL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-27 13:19:19 +00:00
Paul Cornett
7f85af8223 Enable best size caching, remove unnecessary GetLabel() and SetForegroundColour(),
remove hack for non-left alignment, it does not seem to be needed anymore.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-02 21:33:51 +00:00
Paul Cornett
a1a48c8a95 fix wxALIGN_RIGHT in RTL mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-02 18:47:35 +00:00
Vadim Zeitlin
e8375af8ff remove wxWindow::m_needParent and use GTKNeedsParent() which can be overridden in just wxMenuBar (and not set in each and every wxGTK control)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-23 15:16:06 +00:00
Vadim Zeitlin
39bc0347fd added support for ellipsization and markup in wxStaticText (modified patch 1629946)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-01 14:13:15 +00:00
Vadim Zeitlin
61053de43b don't call gtk_label_set_line_wrap() from DoGetBestSize() as this results in an infinite resizing loop when the control is inside a GTK+ widget doing its own layout (such as wxToolBar)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-30 12:14:23 +00:00
Vadim Zeitlin
f4322df68b no changes, just removed TABs/trailing spaces
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-07 22:56:34 +00:00
Vadim Zeitlin
97a8589874 suppress warning about casting -1 to guint
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-16 14:47:37 +00:00
Vadim Zeitlin
ac6e0eb154 added support for underlined fonts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-02 01:27:44 +00:00
Robert Roebling
6959763942 Implemented window coord mirroring for RTL. This
is only implemented for *setting* the coordinates
    which is enough for wxSizers and 99% or other
    dialogs to work.
  Also reversed the meaning of wxStaticText alignment
    in RTL mode. It is possible that later versions
    of GTK actually do that themselves. (?)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-10 19:39:22 +00:00
Robin Dunn
8d1c5c3f57 Add 1 to the width returned by DoGetBestSize in order to work around a
GTK issue where it sometimes wrapps the text needlessly


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-08 18:15:56 +00:00
Vadim Zeitlin
2e1f50128a support mnemonics for wxStatic/RadioBox and made it easier to add support for more controls by virtualizing the mnemonics support logic (patch 1448178)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 14:21:19 +00:00
Vadim Zeitlin
d44a933726 honour the mnemonics; don't use gtk_label_set_markup() for foreground colour as this doesn't seem to be necessary
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 22:41:39 +00:00
Mart Raudsepp
78e017d8f3 GTK2: gtk_radio_button_group -> _set_group; A missed gtk_label_set to set_text. Add a FIXME note for wxStaticText
probably not honoring SetBackgroundColour


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-04 00:09:16 +00:00
Julian Smart
bd1a4a99fc wxControl::SetLabel no longer strips out codes so do it here
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-31 16:01:19 +00:00
Mart Raudsepp
9fa72bd2a6 Use g_signal* instead of deprecated gtk_signal*. Use proper casts for the arguments.
Worth norting from the GTK+ docs: "For future usage, direct use of the GSignal API is recommended, this avoids
significant performance hits where GtkArg structures have to be converted into GValues."


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-22 23:28:58 +00:00
Mart Raudsepp
68567a967b Nuke GTK1 from src/gtk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-22 20:29:17 +00:00
Mart Raudsepp
3d257b8db1 Remove stray whitespaces
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-14 18:32:37 +00:00
Mart Raudsepp
8907154c1a Nuke #pragma implementation/interface's
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-23 12:56:45 +00:00
Robert Roebling
088ddc4e37 This should make the GTK statictext control wrap
and behave like the MSW. I'm still doing further
    tests.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-16 13:34:36 +00:00
Robert Roebling
a5040b80be Implemented text wrapping for GTK (1.2 and 2.X).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-07 22:52:32 +00:00
Václav Slavík
1171e2e56e fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-27 13:47:52 +00:00
Václav Slavík
66bd83b4ec fixed setting colour of wxStaticText in case the label contains XML special characters
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-27 13:42:17 +00:00
Robin Dunn
9f88452895 * Implemented BestSize cache
* Added calls to InvalidateBestSize where things affecting BestSize
  are modified.  There are probably several other places where this
  still needs to be done...

* Added wxWindowBase::GetBestFittingSize that will merge the BestSize
  into the MinSize, (if any) and return the result.

* SetBestFittingSize will now only set the MinSize to the value that
  was passed to it, without merging in the BestSize


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-24 20:09:45 +00:00
Robin Dunn
c0e6c05138 reverted m_adjustMinSize change prepatory for a new approach to fix
the problem


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-21 22:58:13 +00:00
Robin Dunn
fe161a2685 Controls will readjust their size and minsize when SetLabel or SetFont
are called.  Fixed up wxStaticText to blend the wxST_NO_AUTOSIZE with
this new functionality.  Made SetBestSize public under the
SetBestFittingSize name.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-19 01:35:10 +00:00
Václav Slavík
f40fdaa339 fixed GTK styles handling:
1. don't modify the style unless something changed
2. use gtk_widget_modify_style instead of gtk_widget_set_style, the latter is not recommended by GTK+ developers


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-14 17:34:00 +00:00
Václav Slavík
8ccac79865 restored colour labels until we have more information, it seems to work with all GTK2 versions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-06 14:49:21 +00:00
Julian Smart
655719367a Use old licence name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 20:53:33 +00:00
Julian Smart
77ffb5937e Name and version changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 14:56:36 +00:00
Robert Roebling
47ca35dd35 The markup code for wxStaticText doesn't work.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-15 17:33:46 +00:00
Robin Dunn
9d522606d0 Get(Class)DefaultAttributes() for wxGTK controls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-06 17:26:25 +00:00
Robin Dunn
abdeb9e700 Added wxControl::PostCreation for wxGTK. Moved calls to
InheritAttributes and ApplyWidgetStyle there, and added a call to
SetInitialBestSize.   Also removed calls to Show from Create since
PostCreation already does it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-04 07:09:32 +00:00
Robert Roebling
174b10af34 Applied SetForegorund colour patch for GTK2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-29 18:07:31 +00:00
Robin Dunn
e8e24dfa93 Use InheritAttributes for wxGTK widgets so they will check
ShouldInheritColours.  Set wxButton to not inherit colours.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-03 03:24:47 +00:00
Václav Slavík
14f355c2b5 added support for gcc precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 12:46:53 +00:00
Vadim Zeitlin
e1f448eeef corrected bug with alignment of static labels with GTK 2 (replaces patch 760066; closes bug 759375)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 22:32:52 +00:00
Robert Roebling
3b2e67f672 Another UNicode conversion fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-17 17:35:36 +00:00
Robert Roebling
02c0348e97 Forgot Unicode conversion in wxStaticText.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-13 20:37:00 +00:00
Robert Roebling
fab591c5cc Lots of updates for Unicode and GTK 2.0 support.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-05 17:59:20 +00:00
Vadim Zeitlin
1e6feb95a7 first pass of wxUniv merge - nothing works, most parts don't even compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 20:59:19 +00:00
Ove Kaaven
2afa14f2c7 Use GTK_OBJECT_GET_CLASS macro.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-19 10:28:26 +00:00
Robert Roebling
7e2b55cd96 Minor resize probs solved.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-06 18:40:33 +00:00
Robert Roebling
850ff48550 Themes again.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-06 17:32:49 +00:00
Robert Roebling
db434467a1 New colour, font, theme and size code..
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-04 13:02:27 +00:00
Robert Roebling
33720b2de5 Corrected spin control, which ignored hand typed text.
Corrceted GetBestSize() etc of static text (displayed
    in tip dialog and elsewhere).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-03 11:42:49 +00:00
Vadim Zeitlin
f68586e51b wxWindow::GetBestSize() added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-19 21:01:20 +00:00
Robert Roebling
97d7bfb8b4 Added wxEvtHandler::Disconect()
Added wxToolBar::DeleteTool()
  Removed the WXWIN_COMP... defines from the common setup.h
  Some tests,


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-18 15:58:35 +00:00
Robert Roebling
454e2a22c0 Small change to SetFont() logic.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-14 17:04:36 +00:00