Commit Graph

52321 Commits

Author SHA1 Message Date
Vadim Zeitlin
5ed8e4e2e4 Attempt to make wxCompositeWindow<> compile with MSVC6.
Blind attempt to work around VC6 error about ambiguity between "const T&" and
"T" in DoSetForAllParts() template function.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 17:08:57 +00:00
Vadim Zeitlin
339e9747d2 Remove duplicate IMPLEMENT_XXX_CLASS macros from wxUniv code.
The RTTI macros are now used in common code only and having them in wxUniv too
results in linker errors because of duplicate symbols. Just remove them to fix
this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 16:21:42 +00:00
Vadim Zeitlin
f9c77abc2b Declare wxStaticText in wxUniv as being dynamic, not abstract, class.
This fixes a wxUniv build error due to the use of IMPLEMENT_DYNAMIC_CLASS()
for wxStaticText in common code now.

Closes #12842.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 16:21:29 +00:00
Vadim Zeitlin
967956ddcf Compilation fix for PNG saving code when wxUSE_PALETTE==0.
Don't handle wxPNG_TYPE_PALETTE and don't compile PaletteFind() in at all when
wxUSE_PALETTE is off.

Closes #12505.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 15:10:09 +00:00
Stefan Csomor
264b16122e correct macro name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 15:08:25 +00:00
Stefan Csomor
5c60815264 is a #deffed var
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 14:37:54 +00:00
Vadim Zeitlin
37788684ba Use wxControl instead of wxControlWithItems with wxRTTI macros.
wxControlWithItems is just a convenient combination of wxControl and
wxItemContainer mix-in and it is not useful to include it in wxRTTI classes
hierarchy. Also, using wxControlWithItems as the base class for wxChoice and
wxListBox but not for wxComboBox is inconsistent but wxControlWithItems can't
be used for the latter so resolve this by not using it at all.

Ideally we'd have a way of retrieving the list of supported interfaces (such
as wxItemContainer or wxTextEntry) via wxRTTI too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 14:13:29 +00:00
Vadim Zeitlin
f638c25742 Use wxControl as wxComboBox base class for wxRTTI in all ports.
wxComboBox only derives from wxChoice in wxMSW but not in the other ports so
use wxControl as its base class in wxIMPLEMENT_DYNAMIC_CLASS_XTI() macro in
all ports.

See #12841.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 14:13:17 +00:00
Stefan Csomor
72259abb8a fixing rti
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 14:09:41 +00:00
Dimitri Schoolwerth
50fa616c35 Minor wxPNGHandler cleanup.
Use int instead of png_uint_16 everywhere regarding number of palette entries, similar to how libpng exposes it (internally it uses png_uint_16).



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 13:33:48 +00:00
Dimitri Schoolwerth
1de255d613 Fixed deprecated usage warnings in wxPNGHandler.
Since upgrading to a newer libpng its structure members are marked as deprecated (probably as a way to discourage their direct usage). Replaced accessing them by using function calls instead.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 13:06:45 +00:00
Stefan Csomor
65918917b1 add rtti for generic class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 12:52:12 +00:00
Vadim Zeitlin
3e8dba905b Remove duplicate IMPLEMENT_DYNAMIC_CLASS() for wxGtkCalendarCtrl.
wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCalendarCtrl) in the common code makes the use
of IMPLEMENT_DYNAMIC_CLASS() in wxGTK implementation unnecessary.

This fixes wxGTK linking.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 11:48:14 +00:00
Vadim Zeitlin
cfa7a6e239 Don't use "/*" inside a C comment.
gcc warns about it so replace the outer comment with "#if 0" to avoid it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 11:48:06 +00:00
Dimitri Schoolwerth
90e10cd1be Cleaned up wxGIFDecoder.
Applied patch by troelsk which mostly makes the GIF decoder more readable by using named constants instead of magic numbers. Left out the edits that changed unsigned char to wxUint8. In addition removed unnecessary casts around wxInputStream.GetC() calls.

Closes #12506.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 11:47:53 +00:00
Stefan Csomor
6e45339c29 removing msw dependency in non-precomp build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 11:41:43 +00:00
Vadim Zeitlin
a1061906dd wxMSW compilation fix for wxCompositeWindow.
Not all ports override SetXXX() methods in their wxWindow class so use the
versions from wxWindowBase which are definitely known to exist. Notice that
the call itself is still virtual so it doesn't matter which base class do we
use.

Closes #12840.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 11:33:19 +00:00
Vadim Zeitlin
cc72cde0ea Mention that wxDV_ROW_LINES is not implemented in the generic version.
wxDV_ROW_LINES is currently only supported by the native implementations of
wxDataViewCtrl.

See #12834.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 11:30:40 +00:00
Stefan Csomor
8261989803 removing msw dependency in non-precomp build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 11:17:25 +00:00
Stefan Csomor
62d70b3921 porting back exact semicolon version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 10:47:15 +00:00
Stefan Csomor
232e807500 fixing placing of common files for grid and calctrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 10:46:18 +00:00
Stefan Csomor
5c06430713 fixing duplicate rti info for gtk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 09:20:10 +00:00
Stefan Csomor
4e5167dd93 fixing duplicate rti info
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 09:14:40 +00:00
Stefan Csomor
e7478376f1 fixing duplicate rti info
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 09:13:49 +00:00
Stefan Csomor
7dc701d6eb updating xti makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 08:34:15 +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
Stefan Csomor
f0c6b96336 fixing selectors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 08:28:43 +00:00
Stefan Csomor
f437e1552a add methods needed for XTI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 08:25:19 +00:00
Dimitri Schoolwerth
8ee313d2be Added support for saving PNG files with palette.
Based on (heavily modified) patch by troelsk.

Closes #12505.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 22:22:16 +00:00
Vadim Zeitlin
41514cc474 Set up pages range in the wxMSW print dialog correctly.
Propagate the information about the number of pages from the printout to the
print dialog in wxWindowsPrinter::Print().

Closes #12819.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 18:44:36 +00:00
Vadim Zeitlin
ca8b470a41 Add "virtual" keywords to the overridden functions in the printing sample.
There are no real changes, just make it easier to understand that the sample
code overrides the base class virtual methods by reusing the virtual keyword
in the derived class.

See #12819.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 18:44:16 +00:00
Vadim Zeitlin
dd378f3ecb Don't create slider with invalid range in mediaplayer sample.
Use dummy but valid [0, 1] range instead of invalid [0, 0] one.

Closes #12828.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 18:43:54 +00:00
Vadim Zeitlin
fb1e645577 Don't name variables "id" in public headers.
This name clashes with Objective-C reserved keyword and so prevents the
headers using it from being included from Objective-C++ code.

Closes #12832.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 18:43:30 +00:00
Stefan Csomor
58ce18f2fd fixing warning and compile error against 10.4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 18:08:11 +00:00
Stefan Csomor
cc3977bf13 adding new files for xti merge
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 17:43:49 +00:00
Paul Cornett
e4c3d9409a build fix for wxUSE_CONSOLE_EVENTLOOP==0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 17:15:37 +00:00
Paul Cornett
424da8bdb9 non-pch build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 17:06:43 +00:00
Vadim Zeitlin
41e1c9d898 Decrease the margins around the page in the print preview.
Don't hard code 40 pixel margins, this may be too big on small screens.

Use twice the default border size between the dialog elements instead, this is
still pretty arbitrary but at least smaller.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 15:57:42 +00:00
Vadim Zeitlin
e562dfb1a0 Don't hardcode wxPreviewControlBar size in print preview code.
For some reason the control bar height was hard coded to 40 pixels which could
be not enough to use the buttons of the appropriate size. Don't hardcode its
size any more and let the sizer determine it instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 15:57:30 +00:00
Vadim Zeitlin
825794618f Improve print preview appearance and functionality.
Allow to directly enter the page number in the print preview itself instead of
opening a separate dialog in order to do it.

Rearrange the buttons in more visually appealing groups and replace the text
arrows in them with the images.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 15:57:21 +00:00
Václav Slavík
8d96f54dfd Debug messages aren't meant to be translated.
Fixed several incorrect uses of _() in dataview_osx.cpp.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 15:34:10 +00:00
Vadim Zeitlin
64d79e1617 Don't use deprecated NSTableView selectRow:byExtendingSelection: method.
Use selectRowIndexes:byExtendingSelection: instead even if this means that we
need to create a trivial NSIndexSet containing a single index only.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 14:58:47 +00:00
Vadim Zeitlin
e62e216806 Allow selecting any kind of file in the sound sample.
This is especially useful under Mac where wxSound can play files other than
.wav too (e.g. .aiff files which can be found under /System/Library/Sounds).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 14:58:26 +00:00
Jouk Jansen
07549c391e update configuration for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 13:46:00 +00:00
Vadim Zeitlin
a9e41db760 Add wxCompositeWindow<> and use it in wxDatePickerCtrlGeneric.
wxCompositeWindow<> is a convenient base class for composite windows, i.e.
windows consisting of several other wxWindows. Currently it just automatically
forwards various attributes setters calls to all of the composite window parts
but it could become more useful in the future.

Similarly, for now it is only used in wxDatePickerCtrlGeneric but it could
(and should) be used for other composite controls later and we probably should
even make this class public to allow its use in the client code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 11:24:13 +00:00
Vadim Zeitlin
b9acd101f7 No real changes, just remove an unneeded header dependency.
There was some commented out code in (core) valgen.cpp file using
wxDatePickerCtrl (from adv library). Also comment out the inclusion of
wx/datectrl.h header as it's not needed as long as this code remains commented
out and creates an unexpected dependency of a core library file on an adv
library header.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 11:23:49 +00:00
Dimitri Schoolwerth
df16cb09b1 Fixed compilation of datectlg.cpp.
Only including wx/datectrl.h does not always include wx/generic/datectrl.h, for example it does not for MSW non-Universal. As a result when compiling datectlg.cpp wxDatePickerCtrlGeneric is unknown and compilation fails. Fixed by including wx/generic/datectrl.h again (regression since r66524).



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-03 11:01:59 +00:00
Vadim Zeitlin
18f42b94df Remove calls to wxApp::SetTopWindow() from the samples and documentation.
It is definitely not necessary to call SetTopWindow() when there is only a
single top level window and it is arguable whether it's useful to do it even
when there are many of them so don't encourage its use in the documentation
and also remove all its occurrences from the samples.

Closes #12816.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-02 22:05:14 +00:00
Vadim Zeitlin
30d6c59b29 Simplify wxFileNameFromPath() implementation to avoid redundancy.
No real changes, just use wxFileName::GetFullName() in wxFileNameFromPath()
instead of reimplementing it there.

Closes #12818.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-02 22:04:48 +00:00
Vadim Zeitlin
13705b8ccf Fix memory leak if wxDC::DrawBitmap() fails in wxOS2.
Don't forget to free the buffer if we return abnormally.

Closes #12825.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-02 22:04:38 +00:00