Commit Graph

28130 Commits

Author SHA1 Message Date
Vadim Zeitlin
f115ff4a4f Fix conversion from wxColour to NSColor in wxOSX/Cocoa wxDVC.
wxColour components are in 0.255 range while NSColor ones are in 0..1 one. The
old code compiled just fine but didn't work correctly for any colours which
had any channel with value different from 0 and 255 (unsurprisingly, my tests
only used wxRED, wxGREEN and wxBLUE which all passed...).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-12 22:44:23 +00:00
Vadim Zeitlin
38c349189a Implement attributes support in generic wxDataViewIconTextRenderer.
Simply override RenderWithAttr() instead of Render().

Update the sample to show that this works now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-12 22:44:15 +00:00
Vadim Zeitlin
3e60a3c147 Make generic wxDataViewProgressRenderer fill the entire cell.
After the fixes in the previous commit it is finally possibly to make the
progress renderer expand to the entire cell area instead of taking a
fixed width, it is enough to simply override RenderWithAttr() instead of
Render() and ignore the alignment as this avoids the use of (arbitrary and
hardcoded) wxDataViewProgressRenderer::GetSize().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-12 22:44:09 +00:00
Vadim Zeitlin
a6f1201f97 Handle cell alignment in the renderer itself in generic wxDVC.
Instead of using wxDataViewRenderer::GetSize() and rendering the cell into the
appropriate part of the rectangle, pass the full rectangle and the alignment
of the cell contents in it to the renderer itself.

This fixes the bug with bold text being truncated in the "attributes" column
of the dataview sample and is also generally more flexible as the renderer may
decide itself what to do with the extra space.

It also somewhat reduces the code duplication between CreateItemBitmap() and
OnPaint().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-12 22:44:03 +00:00
Vadim Zeitlin
b74399b982 Correct bug with items without attributes in wxGTK wxDVC.
After the change to the sample in r62390 it turned out that wxGTK version
didn't handle items without attributes in a column where other items did have
attributes neither -- they inherited the last used attribute.

Fix this by remembering whether we are using any non-default attributes or not
and resetting them if we do.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-12 22:43:57 +00:00
Vadim Zeitlin
47583ac103 No real changes, just minor cleanup in wxGTK wxDVC.
Don't duplicate wxGtkTreeCellDataFunc declaration.

Don't triplicate "visible" property setting inside the function itself.

Indent the inside of if statement properly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-12 22:43:51 +00:00
Vadim Zeitlin
09a0ece0dc Fix display of items without attributes in Cocoa wxDVC.
The attribute used for the last item was reused for the next item in the same
column unless it was overridden in the attribute of this item, fix this by
remembering the original attribute and using it if no attributes are
explicitly specified.

Also change the sample to show the items without attributes in a column with
attributes and make the label correspond to the attribute of the item.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-12 17:30:48 +00:00
Vadim Zeitlin
a8afd748c7 No real changes, just clean up wxCustomRendererObject in Cocoa wxDVC.
The variables tableColumn and item are unneeded in this class so remove them.

Use static_cast<>s instead of C casts.

Avoid repeating oneVeryLongVariableName->anotherEvenLongerVariableName->
somethingElse->andSoOn multiple times, temporary variables are allowed in C++.

Also don't call wxDataViewCustomRenderer::GetSize() twice unnecessarily.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-12 17:30:41 +00:00
Vadim Zeitlin
67c4b73f9b Use Cocoa methods instead of wx ones in wxDVC font setting code.
Use NSFontManager to create bold or italic version of the font instead of
using wxFont. This works better for the bold attribute, but setting the italic
one still doesn't do anything.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-12 17:30:35 +00:00
Vadim Zeitlin
f6b3bfba97 Add support for cell attributes to wxDVC in wxOSX/Cocoa.
Set the colour and font for the cell before rendering it if we have an
attribute for it.

The colours in dataview sample now work as expected, but making the font bold
or italic still doesn't work for some reason.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-12 13:59:44 +00:00
Vadim Zeitlin
de40d73647 No real changes, just minor cleanup in Cocoa wxDataViewCtrl.
Start cleaning up Cocoa wxDataViewCtrl implementation:
 - Don't use "this->" which is not used anywhere else in wx code.
 - Use "()" instead of "(void)" as per wx coding standards.
 - Don't use end of function comments, this is inconsistent and
   unmaintainable.

No real changes otherwise.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-12 13:59:32 +00:00
Vadim Zeitlin
2d0d781336 Remove wxDataViewTextRendererAttr by merging it with wxDataViewTextRenderer.
There is no reason to have a separate class for rendering the text honouring
the attributes defined for it, wxDataViewTextRenderer itself already does this
perfectly well.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-12 13:59:25 +00:00
Jouk Jansen
30fbed20ac add more samples to the compile cascade for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-12 06:50:59 +00:00
Jaakko Salli
0da1f1c4cc Have page-specific splitter setup flags in order to fix bug that caused splitter change in one page to affect others. Also fixed a regression in splitter auto-centering.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-11 15:30:03 +00:00
Jaakko Salli
b5e184c6ff Code cleanup and clarification
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-11 08:45:34 +00:00
Jaakko Salli
aff6c20af5 Fixed post-expand/collapse rendering
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-11 08:35:48 +00:00
Jaakko Salli
0b6a0a7272 Fixed wxPropertyGrid empty space rendering
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-11 08:32:25 +00:00
Vadim Zeitlin
3781248c7d Compilation fix for STL build.
Don't rely on implicit conversion of wxString to char* in
wxStandardPaths::GetDataDir() added in r62337.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-10 18:28:34 +00:00
Vadim Zeitlin
6da1d056ca Don't use vendor name by default in wxStandardPaths.
The changes in r50025 made the behaviour of wxStandardPaths silently
incompatible with the previous versions under MSW and OS X as it now used the
vendor name in the paths it returned, unlike before. The benefits of doing
this don't justify silently breaking the existing programs so revert this
change and continue to use the application name only by default.

It is, of course, still possible to explicitly ask for the vendor name to be
used with wxStandardPaths::UseAppInfo().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-10 18:28:28 +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
Jaakko Salli
39e4e221dd Removed intermediate wxPanel from wxPropertyGrid.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-10 09:52:44 +00:00
Stefan Csomor
b2665b8676 avoiding deprecated methods in wx code, avoiding for iphone builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-09 17:02:48 +00:00
Vadim Zeitlin
f3d793069f Compilation fix for PCH-less compilation.
To use wxTheApp (added in r62337) we need to include wx/app.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-09 13:05:32 +00:00
Vadim Zeitlin
fa333077f5 Append default extension before showing file save dialog, not after.
Appending the extension after the dialog was hidden is a bad idea as it
misleads the user by using a different file name from the one shown in the
dialog. It is also dangerous as it bypassed wxFD_OVERWRITE_PROMPT check.

So just append the default extension to the initial file name if it doesn't
have any but don't modify the file name once it was accepted by user.

Closes #11256.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-09 13:05:20 +00:00
Vadim Zeitlin
fd4618549b Don't add default extension in wxDocument::SaveAs().
wxFileSelector() takes care of the default extension itself and if it returned
a file name without one, it means that the user really wants to create a file
without an extension. Adding the default extension here is at best useless and
at worst actively dangerous because it may silently overwrite an existing file
(although this bug is due to a different problem, see #11256 for a scenario in
which this can happen).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-09 13:05:10 +00:00
Vadim Zeitlin
8462a84b2c Removed wxFont::Set/GetNoAntiAliasing() implementations.
Most of them were dummy and didn't do anything and this API was never meant to
be used anyhow.

Keep just the declarations in wxFontBase but mark them as deprecated.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-09 13:04:59 +00:00
Stefan Csomor
b38dc31ffa moving bitmapbutton functionality up to button for OSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-09 12:24:35 +00:00
Julian Smart
e77af0118e Revert a workaround for Windows native border side-effect since latter is now fixed
and former causes a positioning problem when the scrollbar is not at the home position and
the grid is resized.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-09 07:26:54 +00:00
Stefan Csomor
fd249a2456 removing unneeded file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-09 06:43:01 +00:00
Vadim Zeitlin
40769afe5f No real changes, just fix a syntax error in unused file.
Closes #11289.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-08 22:38:29 +00:00
Vadim Zeitlin
869b1b26ff Fix mismatched new/free in generic Region code.
Closes #11287.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-08 22:38:18 +00:00
Vadim Zeitlin
2205ca7463 Also support fonts in wxTextCtrl::GetStyle() in wxGTK.
This extends the change of r62262 with support for the fonts.

Closes #11281.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-08 22:38:10 +00:00
Vadim Zeitlin
306a5d9515 Add a WX_APPNAME_DATA_DIR hack for wxStandardPaths::GetDataDir().
Applications using wxStandardPaths::GetDataDir() to find their files under
Unix can't be ran without being installed as they look for their data files
under $prefix/share/appname. Make it possible to override this location by
setting WX_APPNAME_DATA_DIR environment variable to allow running them without
installation.

Notice that this shouldn't present any security risk unless the application is
SUID (which would be a very bad idea anyhow).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-08 22:38:03 +00:00
Stefan Csomor
411a1c35ff implementing rollover and pressed image for bitmapbutton on osx_cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-08 18:38:43 +00:00
Jaakko Salli
c579ac6280 Fixed regression: in wxPropertyGrid::PerformValidation(), wxPGProperty::ValidateValue() was only called when value was variant list, which was exactly the opposite condition under which the function was supposed to be called (fixes #11299).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-08 15:33:30 +00:00
Jouk Jansen
c11b48536b OpenVMS : add compile support for debugrpt sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-08 10:59:33 +00:00
Stefan Csomor
918df9d264 fixing typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-08 06:54:20 +00:00
Paul Cornett
ff7485d88b remove requested button rather than last one, return true from successful Create(), and a non-pch build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-08 05:03:42 +00:00
Kevin Ollivier
d5e7ffcf7a Make sure all Bakefile formats that use CRLF line feeds are set to use CRLF in SVN.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-08 04:07:02 +00:00
Vadim Zeitlin
a8e87569b7 Compilation fix for PCH-less in wxInfoBar.
wx/dcmemory.h include is needed at least for OS X build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-07 15:12:57 +00:00
Stefan Csomor
c315587c21 fixing gdiplus implementation, see #11282
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-07 05:53:19 +00:00
Jouk Jansen
6470a6a950 adding dataview sample to OpenVMS make cascade
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-06 22:03:21 +00:00
Jouk Jansen
4bd57bb6da OpenVMS compile support : adding more samples for wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-06 14:47:53 +00:00
Vadim Zeitlin
21d5ec7d65 Compilation fix for VC6 in wxInfoBarGeneric code.
VC6 apparently can't compare const pointer to derived class with a non-const
pointer to the base class.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-06 14:18:48 +00:00
Jouk Jansen
4ba3c11084 Adding regex support for wxMOTIF for OpenVMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-06 06:58:45 +00:00
Stefan Csomor
ba16c23cea use better background color
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-06 05:18:47 +00:00
Vadim Zeitlin
3c7eea2563 Create an NSAutoreleasePool in wxMacWakeUp().
An auto-release pool is needed in this function because it can be called from
another thread which has no reason to have a pre-existing pool, but it does
allocate NSEvent object which is auto-released, resulting in warnings if no
pool available.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-06 00:08:15 +00:00
Vadim Zeitlin
dc72e2adfa Ensure that an event loop exists in ShowViewOrWindowWithEffect().
We may not have an event loop yet if wxWindow::ShowWithEffect() is called
during the application startup, create a temporary event loop instead of
crashing in this case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-06 00:08:10 +00:00
Vadim Zeitlin
2973301f6f Refactor initialization code in wxTopLevelWindowMSW::Create().
No real changes as the old code was, in fact, correct (although Create()
didn't initialize m_parent explicitly, it was still done in AddChild() if the
parent was not NUL) but just make it more explicit and clear.

Add a new helper wxWindowBase::CreateBase() overload for top level windows,
not taking the validator parameter which doesn't apply to them.

Also make CreateBase() protected as it is only meant to be called from derived
classes Create().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-05 22:58:15 +00:00
Vadim Zeitlin
7ccc497b9c Don't use the current size in DoGetBestSize() by default.
Doing this means that a window which was made initially large because no other
windows were present or shown will refuse to shrink to make space for them
later even if it doesn't need to be that large. The issue was masked under MSW
and GTK because the first size event under these ports is sent so early that
the top level parent window is not realized yet and has default size of 20*20
pixels meaning that its children will cache their initial (very small) size as
their best size, but it was very visible under OS X where the initial layout
is done using the real top level window size and broke wxInfoBar showing in
the dialogs sample, for example.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-05 22:58:10 +00:00