Commit Graph

194 Commits

Author SHA1 Message Date
Dimitri Schoolwerth
8f8d58d193 Use wx-prefixed macros throughout the repository.
Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE
occurrences to use the wx-prefixed version of the macros.
2015-04-23 22:00:35 +04:00
Paul Cornett
87f55e5d14 avoid Gtk-WARNING about negative allocation size with GTK3, closes #16563
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-09-29 17:32:29 +00:00
Paul Cornett
8f97969383 add missing GTK3 implementations of GTKGetWindow()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-02-09 19:53:17 +00:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword.
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-26 16:02:46 +00:00
Paul Cornett
1897abe1d8 avoid functions deprecated in GTK3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-11-25 03:41:42 +00:00
Paul Cornett
7fff16b863 Simplify GetDefaultAttributesFromGTKWidget() by passing the widget to use,
rather than a pointer to a function to create the widget


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-11-25 02:23:34 +00:00
Paul Cornett
9dc44eff02 support for GTK3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 20:39:06 +00:00
Vadim Zeitlin
864181f4f6 Implement wxNotebook::CalcSizeFromPage() for wxGTK.
The implementation is far from perfect as it relies on hard-coded margins but
is better than nothing as it allows wxNotebook best size determination and
SetPageSize() method to work correctly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-24 18:19:26 +00:00
Paul Cornett
fa23222253 avoid GTK3 warning "GtkNotebook %p is mapped but visible child wxPizza %p is not mapped"
whatever problem this hack was supposed to solve, this was not the way to fix it

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-10-25 05:12:14 +00:00
Vadim Zeitlin
abfdefede3 Add wxWithImages helper mix-in with {Set,Get,Assign}ImageList() methods.
Avoid defining SetImageList() in several different places in wx API as not
only this resulted in (trivial) code duplication but this method also had
different semantics before: it didn't take ownership of the pointer passed to
it in wxTreeCtrl, wxListCtrl and wxBookCtrl and derived classes but did take
its ownership in wxDataViewTreeCtrl and wxRichTextFormattingDialog.

Harmonize this for all the classes now: SetImageList() never takes ownership
while AssignImageList() (which is now available in all classes having
SetImageList()) always does.

Also add convenience wxWithImages::GetImage() helper to avoid (more) code
duplication in wxDataViewTreeCtrl code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-21 14:08:43 +00:00
Paul Cornett
4c2ea5999b avoid GCC warning "suggest braces around empty body in an ‘else’ statement"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-06 17:03:31 +00:00
Paul Cornett
385e8575dd avoid deprecated functions and direct struct access
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-28 06:27:49 +00:00
Stefan Csomor
1f6420d83a common rtti in nbkbase.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 22:31:26 +00:00
Vadim Zeitlin
681be2ef80 Refactor: use wxBookCtrlBase::m_selection in all derived classes.
All book control classes with the exception of wxGTK wxNotebook stored the
currently selected page in m_selection or m_nSelection (or, in wxUniv
wxNotebook case, m_sel) variable. Remove all of them and add m_selection
directly to the base class itself so that it can be reused everywhere.

Closes #12622.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-27 16:54:36 +00:00
Vadim Zeitlin
7e837615b9 No real changes, just replace -1 with wxNOT_FOUND in wxBookCtrl code.
Make the code consistently use wxNOT_FOUND instead of -1 everywhere.

See #12622.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-27 16:54:24 +00:00
Vadim Zeitlin
03647350fc No changes, just removed hard tabs and trailing white space.
This commit is huge but there are no non-white-space changes in it.

Some files containing third-party sources (src/msw/wince/time.cpp,
src/x11/pango*.cpp) were left unchanged.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-08-21 10:41:26 +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
Robert Roebling
496e7ec647 More GTK prefixing for internal methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-13 10:25:38 +00:00
Paul Cornett
48200154f4 replace m_insertCallback with a virtual function, contrary to the old comments a virtual works just fine
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-29 15:46:48 +00:00
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
Paul Cornett
c58d22381a remove text field from page data, add much more useful image widget pointer, lots of code simplification and cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-19 16:28:40 +00:00
Paul Cornett
75c6febf44 fix for page change not working after veto, #3808
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-15 04:52:13 +00:00
Paul Cornett
1e4db45055 move notebook event definition to common code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-13 14:56:42 +00:00
Vadim Zeitlin
3e97a90518 use a single wxBookCtrlEvent class for all wxBookCtrlBase-derived controls (#9667)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-08-01 13:46:46 +00:00
Robert Roebling
89edb75e59 Remove old GTK 1.2 code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-03 19:49:06 +00:00
Vadim Zeitlin
ec96848003 don't use gtk_notebook_insert_page() return value as some old GTK+ versions (the one in Solaris 9 for instance) don't have it; also don't use gtk_notebook_get_nth_page() which we need this return value for at all in the trunk as it seems to be unnecessary
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-27 00:28:45 +00:00
Paul Cornett
253d8fd8fc fix for infinite sizing loop (partial patch 1907189)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-14 15:55:09 +00:00
Vadim Zeitlin
f986fe7613 fix wxNotebook::GetPage{Text,Image}() when they were called from the page change event handler for the first added page (patch 1895161)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-17 01:37:23 +00:00
Robert Roebling
a27555e453 [ 1865141 ] wxNotebook::DeletePage can result in invalid page selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-07 13:02:51 +00:00
Julian Smart
8dba4c7230 Corrected wxRTTI for wxNotebook so dynamic casting to wxBookCtrlBase works
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-20 10:52:05 +00:00
Vadim Zeitlin
e4161a2a08 use -Wunused-parameter with gcc for consistency with MSVC and other compilers which warn about this; fix the uncovered warnings in wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-23 22:19:34 +00:00
Paul Cornett
9826452012 block signal handlers, instead of disconnecting, to temporarily disable them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-27 17:38:13 +00:00
Paul Cornett
823fb291ae remove gtk1 code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-14 05:56:47 +00:00
Paul Cornett
c821db16e6 Remove unneeded wxTLW child inserter function.
Simplify wxFrame child inserter.
Use the same signature for all the child inserters.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-25 05:08:18 +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
Paul Cornett
a1abca322f Reorganize idle system code.
Installing idle handler from GTK callbacks is no longer necessary.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-19 16:58:07 +00:00
Vadim Zeitlin
28e88942bc use native TAB traversal for GTK+ 2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-26 19:30:20 +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
Robert Roebling
c98826242f Reorder event things a little.
Two callbacks for page change and page changing.
    use signal_connect_after() for page changed event,
      as everywhere else, this should also make it
      possible to select a different page in the
      event handler.
    GetSelection just uses native call.
    Don't use m_skipEvent flag, disconnect from events.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-04 18:29:28 +00:00
Robert Roebling
7ceea08fa3 Reenabled page selection event when page in notebook
was deleted.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-04 16:56:07 +00:00
Robert Roebling
9c862cfb93 [ 1577675 ] Fix for GTK warnings in wxNotebook::DoRemovePage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-15 18:44:33 +00:00
Paul Cornett
d41e1ab481 replace use of deprecated GtkPixmap, gtk_container_border_width
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-15 04:36:31 +00:00
Vadim Zeitlin
fea909e19e no changes, just replaced C comment with a C++ one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-09 17:11:10 +00:00
Vadim Zeitlin
a570e8f8fe added SendPageChanging/ChangedEvent() functions; fixed wxCocoa build broken by wxNotebook::ChangePage() change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-08 23:41:52 +00:00
Vadim Zeitlin
1d6fcbcc70 added wxBookCtrl::ChangeSelection() which is the same as SetSelection() but doesn't send the page change events (second part of patch 1553551)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-08 17:37:23 +00:00
Julian Smart
3ba6891d6a Strip menu codes out from notebook page labels
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-08 16:00:43 +00:00
Václav Slavík
22a35096a0 renamed wxRect::Inside() to wxRect::Contains(), wxRect::Inside(wxRect) is too confusing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-13 17:12:25 +00:00
Paul Cornett
c7b2e4941f returning true is sufficient to stop signal emission
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-27 00:31:39 +00:00
Paul Cornett
1481968400 use "event" signal emission hook to install idle handler for many events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-26 22:07:45 +00:00
Vadim Zeitlin
ef5c70f96f Many changes:
- Introduced GTKGetWindow() which returns all GdkWindows associated with the
  given wxWindow
- Renamed IsOwnGtkWindow() to GTKIsOwnWindow() to avoid confusion with the old
  virtual function (the new one is non-virtual and is implemented in terms of
  GTKGetWindow())
- Refactored/simplified event handlers code in gtk/window.cpp
- Fixed some header guards names (__GTKFOO__ -> _WX_GTK_FOO_H_)
- Added GTKUpdateCursor() which sets the current cursor for all windows
  returned by GTKGetWindow()
- Factored out code from many different classes in wxControl::OnInternalIdle()
  which now updates the cursor, checks for internal focus and sends update UI
  events


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-25 12:59:28 +00:00