From bb69632a56a827bed4cfae842bfffa88259ac1aa Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Sat, 22 Nov 2008 00:21:10 +0000 Subject: [PATCH] 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 --- interface/wx/defs.h | 2 +- interface/wx/event.h | 12 ++++++------ interface/wx/frame.h | 25 ++++++++++++------------- interface/wx/mdi.h | 4 ++-- interface/wx/pen.h | 6 +++--- interface/wx/printdlg.h | 3 +-- interface/wx/slider.h | 22 ++++++++++------------ interface/wx/statusbr.h | 6 ++---- interface/wx/toolbar.h | 24 +++++++----------------- 9 files changed, 44 insertions(+), 60 deletions(-) diff --git a/interface/wx/defs.h b/interface/wx/defs.h index db398b84d3..cc30169f3c 100644 --- a/interface/wx/defs.h +++ b/interface/wx/defs.h @@ -99,7 +99,7 @@ enum wxPaperSize 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 - // Windows 95 Only + // wxMSW Only wxPAPER_ISO_B4, ///< B4 (ISO) 250 x 353 mm wxPAPER_JAPANESE_POSTCARD, ///< Japanese Postcard 100 x 148 mm diff --git a/interface/wx/event.h b/interface/wx/event.h index 22e06d8fe6..88f3714d07 100644 --- a/interface/wx/event.h +++ b/interface/wx/event.h @@ -321,7 +321,7 @@ public: share the same string buffer internally. Use QueueEvent() to avoid 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 on the stack). This requires that the wxEvent::Clone() method be 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 has moved off a tool. @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)} - 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)} - 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)} - 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)} - 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)} Process a wxEVT_COMMAND_ENTER command, which is generated by a control. @endEventTable diff --git a/interface/wx/frame.h b/interface/wx/frame.h index 84a81d2ebb..92a9479fc4 100644 --- a/interface/wx/frame.h +++ b/interface/wx/frame.h @@ -222,19 +222,18 @@ public: @return A pointer to the toolbar if it was created successfully, @NULL otherwise. - @remarks By default, the toolbar is an instance of wxToolBar (which is - defined to be a suitable toolbar class on each - platform, such as wxToolBar95). To use a different - class, override OnCreateToolBar(). - When a toolbar has been created with this function, or made - known to the frame with wxFrame::SetToolBar, the frame will - manage the toolbar position and adjust the return value from - wxWindow::GetClientSize to reflect the available space for - application windows. - Under Pocket PC, you should always use this 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 own toolbars, create a wxToolBar as usual. + @remarks + By default, the toolbar is an instance of wxToolBar. + To use a different class, override OnCreateToolBar(). + When a toolbar has been created with this function, or made + known to the frame with wxFrame::SetToolBar(), the frame will + manage the toolbar position and adjust the return value from + wxWindow::GetClientSize() to reflect the available space for + application windows. + Under Pocket PC, you should always use this 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 own toolbars, create a wxToolBar as usual. @see CreateStatusBar(), OnCreateToolBar(), SetToolBar(), GetToolBar() */ diff --git a/interface/wx/mdi.h b/interface/wx/mdi.h index 0729f366f5..63119a1368 100644 --- a/interface/wx/mdi.h +++ b/interface/wx/mdi.h @@ -25,7 +25,7 @@ be overridden in order to give an opportunity to use a different class of client 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. @library{wxcore} @@ -157,7 +157,7 @@ public: @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 style when a child is maximized. diff --git a/interface/wx/pen.h b/interface/wx/pen.h index 4c5fb7eb7b..97e940d15f 100644 --- a/interface/wx/pen.h +++ b/interface/wx/pen.h @@ -162,9 +162,9 @@ public: The style may be one of the ::wxPenStyle values. @remarks Different versions of Windows and different versions of other - platforms support very different subsets of the styles - above - there is no similarity even between Windows95 - and Windows98 - so handle with care. + platforms support very different subsets of the styles above + - there is no similarity even between Windows95 and Windows98 - + so handle with care. @see SetStyle(), SetColour(), SetWidth() */ diff --git a/interface/wx/printdlg.h b/interface/wx/printdlg.h index a02e924c55..4cb99f4f69 100644 --- a/interface/wx/printdlg.h +++ b/interface/wx/printdlg.h @@ -93,8 +93,7 @@ public: @library{wxcore} @category{printing} - @see @ref overview_printing "Printing framework overview", - wxPrintDialog, wxPageSetupDialogData + @see @ref overview_printing, wxPrintDialog, wxPageSetupDialogData */ class wxPageSetupDialog : public wxDialog { diff --git a/interface/wx/slider.h b/interface/wx/slider.h index 82f6384e9f..6bb50161b8 100644 --- a/interface/wx/slider.h +++ b/interface/wx/slider.h @@ -103,8 +103,6 @@ Please see the widgets sample ("Slider" page) to see the difference between EVT_SCROLL_THUMBRELEASE and EVT_SCROLL_CHANGED in action. - @todo are all strings "Windows 95 only" really up2date? - @library{wxcore} @category{ctrl} @appearance{slider.png} @@ -161,14 +159,14 @@ public: /** Clears the selection, for a slider with the @b wxSL_SELRANGE style. - @remarks Windows 95 only. + @onlyfor{wxmsw} */ virtual void ClearSel(); /** Clears the ticks. - @remarks Windows 95 only. + @onlyfor{wxmsw} */ virtual void ClearTicks(); @@ -213,7 +211,7 @@ public: /** Returns the selection end point. - @remarks Windows 95 only. + @onlyfor{wxmsw} @see GetSelStart(), SetSelection() */ @@ -222,7 +220,7 @@ public: /** Returns the selection start point. - @remarks Windows 95 only. + @onlyfor{wxmsw} @see GetSelEnd(), SetSelection() */ @@ -231,7 +229,7 @@ public: /** Returns the thumb length. - @remarks Windows 95 only. + @onlyfor{wxmsw} @see SetThumbLength() */ @@ -240,7 +238,7 @@ public: /** Returns the tick frequency. - @remarks Windows 95 only. + @onlyfor{wxmsw} @see SetTickFreq() */ @@ -289,7 +287,7 @@ public: @param endPos The selection end position. - @remarks Windows 95 only. + @onlyfor{wxmsw} @see GetSelStart(), GetSelEnd() */ @@ -301,7 +299,7 @@ public: @param len The thumb length. - @remarks Windows 95 only. + @onlyfor{wxmsw} @see GetThumbLength() */ @@ -313,7 +311,7 @@ public: @param tickPos The tick position. - @remarks Windows 95 only. + @onlyfor{wxmsw} @see SetTickFreq() */ @@ -328,7 +326,7 @@ public: @param pos Position. Must be greater than zero. @todo: what is this for? - @remarks Windows 95 only. + @onlyfor{wxmsw} @see GetTickFreq() */ diff --git a/interface/wx/statusbr.h b/interface/wx/statusbr.h index d224501963..d1f31573e9 100644 --- a/interface/wx/statusbr.h +++ b/interface/wx/statusbr.h @@ -15,14 +15,12 @@ @beginStyleTable @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 - @todo reference to win95 may be old and wrong - @remarks 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} @category{miscwnd} diff --git a/interface/wx/toolbar.h b/interface/wx/toolbar.h index 1292dfdfb1..45705ce735 100644 --- a/interface/wx/toolbar.h +++ b/interface/wx/toolbar.h @@ -9,15 +9,10 @@ /** @class wxToolBar - The name wxToolBar is defined to be a synonym for one of the following - classes: + A toolbar is a bar of buttons and/or other controls usually placed below + the menu bar in a wxFrame. - - @b wxToolBar95 - The native Windows 95 toolbar. Used on Windows 95, NT 4 - 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 + You may create a toolbar that is managed by the frame, by calling wxFrame::CreateToolBar(). Under Pocket PC, you should always use this 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 @@ -26,26 +21,21 @@ The meaning of a "separator" is a vertical line under Windows and simple space under GTK+. - @b wxToolBar95: Note that this toolbar paints tools to reflect - system-wide colours. If you use more than 16 colours in your tool - bitmaps, you may wish to suppress this behaviour, otherwise system - colours in your bitmaps will inadvertently be mapped to system colours. + wxMSW note: Note that under wxMSW toolbar paints tools to reflect + system-wide colours. If you use more than 16 colours in your tool bitmaps, + you may wish to suppress this behaviour, otherwise system colours in your + bitmaps will inadvertently be mapped to system colours. To do this, set the msw.remap system option before creating the toolbar: - @code wxSystemOptions::SetOption(wxT("msw.remap"), 0); @endcode - If you wish to use 32-bit images (which include an alpha channel for transparency) use: - @code wxSystemOptions::SetOption(wxT("msw.remap"), 2); @endcode - Then colour remapping is switched off, and a transparent background used. But only use this option under Windows XP with true colour: - @code if (wxTheApp->GetComCtl32Version() >= 600 && ::wxDisplayDepth() >= 32) @endcode -- 2.45.2