minor fixes; replace references to Windows95 with references to wxMSW where possible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
e48df5d353
commit
bb69632a56
@ -99,7 +99,7 @@ enum wxPaperSize
|
|||||||
wxPAPER_FANFOLD_STD_GERMAN, ///< German Std Fanfold, 8 1/2 by 12 inches
|
wxPAPER_FANFOLD_STD_GERMAN, ///< German Std Fanfold, 8 1/2 by 12 inches
|
||||||
wxPAPER_FANFOLD_LGL_GERMAN, ///< German Legal Fanfold, 8 1/2 by 13 inches
|
wxPAPER_FANFOLD_LGL_GERMAN, ///< German Legal Fanfold, 8 1/2 by 13 inches
|
||||||
|
|
||||||
// Windows 95 Only
|
// wxMSW Only
|
||||||
|
|
||||||
wxPAPER_ISO_B4, ///< B4 (ISO) 250 x 353 mm
|
wxPAPER_ISO_B4, ///< B4 (ISO) 250 x 353 mm
|
||||||
wxPAPER_JAPANESE_POSTCARD, ///< Japanese Postcard 100 x 148 mm
|
wxPAPER_JAPANESE_POSTCARD, ///< Japanese Postcard 100 x 148 mm
|
||||||
|
@ -321,7 +321,7 @@ public:
|
|||||||
share the same string buffer internally. Use QueueEvent() to avoid
|
share the same string buffer internally. Use QueueEvent() to avoid
|
||||||
this.
|
this.
|
||||||
|
|
||||||
A copy of event is made by the function, so the original can be deleted
|
A copy of @a event is made by the function, so the original can be deleted
|
||||||
as soon as function returns (it is common that the original is created
|
as soon as function returns (it is common that the original is created
|
||||||
on the stack). This requires that the wxEvent::Clone() method be
|
on the stack). This requires that the wxEvent::Clone() method be
|
||||||
implemented by event so that it can be duplicated and stored until it
|
implemented by event so that it can be duplicated and stored until it
|
||||||
@ -1899,15 +1899,15 @@ public:
|
|||||||
The value of wxCommandEvent::GetSelection() is the tool id, or -1 if the mouse cursor
|
The value of wxCommandEvent::GetSelection() is the tool id, or -1 if the mouse cursor
|
||||||
has moved off a tool.
|
has moved off a tool.
|
||||||
@event{EVT_COMMAND_LEFT_CLICK(id, func)}
|
@event{EVT_COMMAND_LEFT_CLICK(id, func)}
|
||||||
Process a wxEVT_COMMAND_LEFT_CLICK command, which is generated by a control (Windows 95 and NT only).
|
Process a wxEVT_COMMAND_LEFT_CLICK command, which is generated by a control (wxMSW only).
|
||||||
@event{EVT_COMMAND_LEFT_DCLICK(id, func)}
|
@event{EVT_COMMAND_LEFT_DCLICK(id, func)}
|
||||||
Process a wxEVT_COMMAND_LEFT_DCLICK command, which is generated by a control (Windows 95 and NT only).
|
Process a wxEVT_COMMAND_LEFT_DCLICK command, which is generated by a control (wxMSW only).
|
||||||
@event{EVT_COMMAND_RIGHT_CLICK(id, func)}
|
@event{EVT_COMMAND_RIGHT_CLICK(id, func)}
|
||||||
Process a wxEVT_COMMAND_RIGHT_CLICK command, which is generated by a control (Windows 95 and NT only).
|
Process a wxEVT_COMMAND_RIGHT_CLICK command, which is generated by a control (wxMSW only).
|
||||||
@event{EVT_COMMAND_SET_FOCUS(id, func)}
|
@event{EVT_COMMAND_SET_FOCUS(id, func)}
|
||||||
Process a wxEVT_COMMAND_SET_FOCUS command, which is generated by a control (Windows 95 and NT only).
|
Process a wxEVT_COMMAND_SET_FOCUS command, which is generated by a control (wxMSW only).
|
||||||
@event{EVT_COMMAND_KILL_FOCUS(id, func)}
|
@event{EVT_COMMAND_KILL_FOCUS(id, func)}
|
||||||
Process a wxEVT_COMMAND_KILL_FOCUS command, which is generated by a control (Windows 95 and NT only).
|
Process a wxEVT_COMMAND_KILL_FOCUS command, which is generated by a control (wxMSW only).
|
||||||
@event{EVT_COMMAND_ENTER(id, func)}
|
@event{EVT_COMMAND_ENTER(id, func)}
|
||||||
Process a wxEVT_COMMAND_ENTER command, which is generated by a control.
|
Process a wxEVT_COMMAND_ENTER command, which is generated by a control.
|
||||||
@endEventTable
|
@endEventTable
|
||||||
|
@ -222,19 +222,18 @@ public:
|
|||||||
@return A pointer to the toolbar if it was created successfully, @NULL
|
@return A pointer to the toolbar if it was created successfully, @NULL
|
||||||
otherwise.
|
otherwise.
|
||||||
|
|
||||||
@remarks By default, the toolbar is an instance of wxToolBar (which is
|
@remarks
|
||||||
defined to be a suitable toolbar class on each
|
By default, the toolbar is an instance of wxToolBar.
|
||||||
platform, such as wxToolBar95). To use a different
|
To use a different class, override OnCreateToolBar().
|
||||||
class, override OnCreateToolBar().
|
When a toolbar has been created with this function, or made
|
||||||
When a toolbar has been created with this function, or made
|
known to the frame with wxFrame::SetToolBar(), the frame will
|
||||||
known to the frame with wxFrame::SetToolBar, the frame will
|
manage the toolbar position and adjust the return value from
|
||||||
manage the toolbar position and adjust the return value from
|
wxWindow::GetClientSize() to reflect the available space for
|
||||||
wxWindow::GetClientSize to reflect the available space for
|
application windows.
|
||||||
application windows.
|
Under Pocket PC, you should always use this function for creating
|
||||||
Under Pocket PC, you should always use this function for creating
|
the toolbar to be managed by the frame, so that wxWidgets can
|
||||||
the toolbar to be managed by the frame, so that wxWidgets can
|
use a combined menubar and toolbar.
|
||||||
use a combined menubar and toolbar.
|
Where you manage your own toolbars, create a wxToolBar as usual.
|
||||||
Where you manage your own toolbars, create a wxToolBar as usual.
|
|
||||||
|
|
||||||
@see CreateStatusBar(), OnCreateToolBar(), SetToolBar(), GetToolBar()
|
@see CreateStatusBar(), OnCreateToolBar(), SetToolBar(), GetToolBar()
|
||||||
*/
|
*/
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
be overridden in order to give an opportunity to use a different class of client
|
be overridden in order to give an opportunity to use a different class of client
|
||||||
window.
|
window.
|
||||||
|
|
||||||
Under Windows 95, the client window will automatically have a sunken border style
|
Under wxMSW, the client window will automatically have a sunken border style
|
||||||
when the active child is not maximized, and no border style when a child is maximized.
|
when the active child is not maximized, and no border style when a child is maximized.
|
||||||
|
|
||||||
@library{wxcore}
|
@library{wxcore}
|
||||||
@ -157,7 +157,7 @@ public:
|
|||||||
|
|
||||||
@remarks
|
@remarks
|
||||||
|
|
||||||
Under Windows 95, the client window will automatically have a sunken
|
Under wxMSW, the client window will automatically have a sunken
|
||||||
border style when the active child is not maximized, and no border
|
border style when the active child is not maximized, and no border
|
||||||
style when a child is maximized.
|
style when a child is maximized.
|
||||||
|
|
||||||
|
@ -162,9 +162,9 @@ public:
|
|||||||
The style may be one of the ::wxPenStyle values.
|
The style may be one of the ::wxPenStyle values.
|
||||||
|
|
||||||
@remarks Different versions of Windows and different versions of other
|
@remarks Different versions of Windows and different versions of other
|
||||||
platforms support very different subsets of the styles
|
platforms support very different subsets of the styles above
|
||||||
above - there is no similarity even between Windows95
|
- there is no similarity even between Windows95 and Windows98 -
|
||||||
and Windows98 - so handle with care.
|
so handle with care.
|
||||||
|
|
||||||
@see SetStyle(), SetColour(), SetWidth()
|
@see SetStyle(), SetColour(), SetWidth()
|
||||||
*/
|
*/
|
||||||
|
@ -93,8 +93,7 @@ public:
|
|||||||
@library{wxcore}
|
@library{wxcore}
|
||||||
@category{printing}
|
@category{printing}
|
||||||
|
|
||||||
@see @ref overview_printing "Printing framework overview",
|
@see @ref overview_printing, wxPrintDialog, wxPageSetupDialogData
|
||||||
wxPrintDialog, wxPageSetupDialogData
|
|
||||||
*/
|
*/
|
||||||
class wxPageSetupDialog : public wxDialog
|
class wxPageSetupDialog : public wxDialog
|
||||||
{
|
{
|
||||||
|
@ -103,8 +103,6 @@
|
|||||||
Please see the widgets sample ("Slider" page) to see the difference between
|
Please see the widgets sample ("Slider" page) to see the difference between
|
||||||
EVT_SCROLL_THUMBRELEASE and EVT_SCROLL_CHANGED in action.
|
EVT_SCROLL_THUMBRELEASE and EVT_SCROLL_CHANGED in action.
|
||||||
|
|
||||||
@todo are all strings "Windows 95 only" really up2date?
|
|
||||||
|
|
||||||
@library{wxcore}
|
@library{wxcore}
|
||||||
@category{ctrl}
|
@category{ctrl}
|
||||||
@appearance{slider.png}
|
@appearance{slider.png}
|
||||||
@ -161,14 +159,14 @@ public:
|
|||||||
/**
|
/**
|
||||||
Clears the selection, for a slider with the @b wxSL_SELRANGE style.
|
Clears the selection, for a slider with the @b wxSL_SELRANGE style.
|
||||||
|
|
||||||
@remarks Windows 95 only.
|
@onlyfor{wxmsw}
|
||||||
*/
|
*/
|
||||||
virtual void ClearSel();
|
virtual void ClearSel();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Clears the ticks.
|
Clears the ticks.
|
||||||
|
|
||||||
@remarks Windows 95 only.
|
@onlyfor{wxmsw}
|
||||||
*/
|
*/
|
||||||
virtual void ClearTicks();
|
virtual void ClearTicks();
|
||||||
|
|
||||||
@ -213,7 +211,7 @@ public:
|
|||||||
/**
|
/**
|
||||||
Returns the selection end point.
|
Returns the selection end point.
|
||||||
|
|
||||||
@remarks Windows 95 only.
|
@onlyfor{wxmsw}
|
||||||
|
|
||||||
@see GetSelStart(), SetSelection()
|
@see GetSelStart(), SetSelection()
|
||||||
*/
|
*/
|
||||||
@ -222,7 +220,7 @@ public:
|
|||||||
/**
|
/**
|
||||||
Returns the selection start point.
|
Returns the selection start point.
|
||||||
|
|
||||||
@remarks Windows 95 only.
|
@onlyfor{wxmsw}
|
||||||
|
|
||||||
@see GetSelEnd(), SetSelection()
|
@see GetSelEnd(), SetSelection()
|
||||||
*/
|
*/
|
||||||
@ -231,7 +229,7 @@ public:
|
|||||||
/**
|
/**
|
||||||
Returns the thumb length.
|
Returns the thumb length.
|
||||||
|
|
||||||
@remarks Windows 95 only.
|
@onlyfor{wxmsw}
|
||||||
|
|
||||||
@see SetThumbLength()
|
@see SetThumbLength()
|
||||||
*/
|
*/
|
||||||
@ -240,7 +238,7 @@ public:
|
|||||||
/**
|
/**
|
||||||
Returns the tick frequency.
|
Returns the tick frequency.
|
||||||
|
|
||||||
@remarks Windows 95 only.
|
@onlyfor{wxmsw}
|
||||||
|
|
||||||
@see SetTickFreq()
|
@see SetTickFreq()
|
||||||
*/
|
*/
|
||||||
@ -289,7 +287,7 @@ public:
|
|||||||
@param endPos
|
@param endPos
|
||||||
The selection end position.
|
The selection end position.
|
||||||
|
|
||||||
@remarks Windows 95 only.
|
@onlyfor{wxmsw}
|
||||||
|
|
||||||
@see GetSelStart(), GetSelEnd()
|
@see GetSelStart(), GetSelEnd()
|
||||||
*/
|
*/
|
||||||
@ -301,7 +299,7 @@ public:
|
|||||||
@param len
|
@param len
|
||||||
The thumb length.
|
The thumb length.
|
||||||
|
|
||||||
@remarks Windows 95 only.
|
@onlyfor{wxmsw}
|
||||||
|
|
||||||
@see GetThumbLength()
|
@see GetThumbLength()
|
||||||
*/
|
*/
|
||||||
@ -313,7 +311,7 @@ public:
|
|||||||
@param tickPos
|
@param tickPos
|
||||||
The tick position.
|
The tick position.
|
||||||
|
|
||||||
@remarks Windows 95 only.
|
@onlyfor{wxmsw}
|
||||||
|
|
||||||
@see SetTickFreq()
|
@see SetTickFreq()
|
||||||
*/
|
*/
|
||||||
@ -328,7 +326,7 @@ public:
|
|||||||
@param pos
|
@param pos
|
||||||
Position. Must be greater than zero. @todo: what is this for?
|
Position. Must be greater than zero. @todo: what is this for?
|
||||||
|
|
||||||
@remarks Windows 95 only.
|
@onlyfor{wxmsw}
|
||||||
|
|
||||||
@see GetTickFreq()
|
@see GetTickFreq()
|
||||||
*/
|
*/
|
||||||
|
@ -15,14 +15,12 @@
|
|||||||
|
|
||||||
@beginStyleTable
|
@beginStyleTable
|
||||||
@style{wxST_SIZEGRIP}
|
@style{wxST_SIZEGRIP}
|
||||||
On Windows 95, displays a gripper at right-hand side of the status bar.
|
Displays a gripper at the right-hand side of the status bar.
|
||||||
@endStyleTable
|
@endStyleTable
|
||||||
|
|
||||||
@todo reference to win95 may be old and wrong
|
|
||||||
|
|
||||||
@remarks
|
@remarks
|
||||||
It is possible to create controls and other windows on the status bar.
|
It is possible to create controls and other windows on the status bar.
|
||||||
Position these windows from an OnSize event handler.
|
Position these windows from an OnSize() event handler.
|
||||||
|
|
||||||
@library{wxcore}
|
@library{wxcore}
|
||||||
@category{miscwnd}
|
@category{miscwnd}
|
||||||
|
@ -9,15 +9,10 @@
|
|||||||
/**
|
/**
|
||||||
@class wxToolBar
|
@class wxToolBar
|
||||||
|
|
||||||
The name wxToolBar is defined to be a synonym for one of the following
|
A toolbar is a bar of buttons and/or other controls usually placed below
|
||||||
classes:
|
the menu bar in a wxFrame.
|
||||||
|
|
||||||
- @b wxToolBar95 - The native Windows 95 toolbar. Used on Windows 95, NT 4
|
You may create a toolbar that is managed by the frame, by calling
|
||||||
and above.
|
|
||||||
- @b wxToolBarMSW - A Windows implementation. Used on 16-bit Windows.
|
|
||||||
- @b wxToolBarGTK - The GTK toolbar.
|
|
||||||
|
|
||||||
You may also create a toolbar that is managed by the frame, by calling
|
|
||||||
wxFrame::CreateToolBar(). Under Pocket PC, you should always use this
|
wxFrame::CreateToolBar(). Under Pocket PC, you should always use this
|
||||||
function for creating the toolbar to be managed by the frame, so that
|
function for creating the toolbar to be managed by the frame, so that
|
||||||
wxWidgets can use a combined menubar and toolbar. Where you manage your
|
wxWidgets can use a combined menubar and toolbar. Where you manage your
|
||||||
@ -26,26 +21,21 @@
|
|||||||
The meaning of a "separator" is a vertical line under Windows and simple
|
The meaning of a "separator" is a vertical line under Windows and simple
|
||||||
space under GTK+.
|
space under GTK+.
|
||||||
|
|
||||||
@b wxToolBar95: Note that this toolbar paints tools to reflect
|
<b>wxMSW note</b>: Note that under wxMSW toolbar paints tools to reflect
|
||||||
system-wide colours. If you use more than 16 colours in your tool
|
system-wide colours. If you use more than 16 colours in your tool bitmaps,
|
||||||
bitmaps, you may wish to suppress this behaviour, otherwise system
|
you may wish to suppress this behaviour, otherwise system colours in your
|
||||||
colours in your bitmaps will inadvertently be mapped to system colours.
|
bitmaps will inadvertently be mapped to system colours.
|
||||||
To do this, set the msw.remap system option before creating the toolbar:
|
To do this, set the msw.remap system option before creating the toolbar:
|
||||||
|
|
||||||
@code
|
@code
|
||||||
wxSystemOptions::SetOption(wxT("msw.remap"), 0);
|
wxSystemOptions::SetOption(wxT("msw.remap"), 0);
|
||||||
@endcode
|
@endcode
|
||||||
|
|
||||||
If you wish to use 32-bit images (which include an alpha channel for
|
If you wish to use 32-bit images (which include an alpha channel for
|
||||||
transparency) use:
|
transparency) use:
|
||||||
|
|
||||||
@code
|
@code
|
||||||
wxSystemOptions::SetOption(wxT("msw.remap"), 2);
|
wxSystemOptions::SetOption(wxT("msw.remap"), 2);
|
||||||
@endcode
|
@endcode
|
||||||
|
|
||||||
Then colour remapping is switched off, and a transparent background
|
Then colour remapping is switched off, and a transparent background
|
||||||
used. But only use this option under Windows XP with true colour:
|
used. But only use this option under Windows XP with true colour:
|
||||||
|
|
||||||
@code
|
@code
|
||||||
if (wxTheApp->GetComCtl32Version() >= 600 && ::wxDisplayDepth() >= 32)
|
if (wxTheApp->GetComCtl32Version() >= 600 && ::wxDisplayDepth() >= 32)
|
||||||
@endcode
|
@endcode
|
||||||
|
Loading…
Reference in New Issue
Block a user