Olly Betts' typo patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
parent
3103e8a97e
commit
d69225772a
@ -260,7 +260,7 @@ STDMETHODIMP wxIDropTarget::DragLeave()
|
||||
// Returns : S_OK
|
||||
// Params : [in] IDataObject *pIDataSource the data to paste
|
||||
// [in] DWORD grfKeyState kbd & mouse state
|
||||
// [in] POINTL pt where the drop occured?
|
||||
// [in] POINTL pt where the drop occurred?
|
||||
// [ouy]DWORD *pdwEffect operation effect
|
||||
// Notes :
|
||||
STDMETHODIMP wxIDropTarget::Drop(IDataObject *pIDataSource,
|
||||
|
||||
@ -194,7 +194,7 @@ wxBitmap::wxBitmap(
|
||||
//
|
||||
// We assume that it is in XBM format which is not quite the same as
|
||||
// the format CreateBitmap() wants because the order of bytes in the
|
||||
// line is inversed!
|
||||
// line is reversed!
|
||||
//
|
||||
const size_t nBytesPerLine = (nWidth + 7) / 8;
|
||||
const size_t nPadding = nBytesPerLine % 2;
|
||||
|
||||
@ -1387,7 +1387,7 @@ void wxDC::DoDrawBitmap(
|
||||
lColor = m_textBackgroundColour.GetPixel();
|
||||
|
||||
//
|
||||
// Bitmap must be ina double-word alligned address so we may
|
||||
// Bitmap must be in a double-word aligned address so we may
|
||||
// have some padding to worry about
|
||||
//
|
||||
if (nLineBoundary > 0)
|
||||
|
||||
@ -180,7 +180,7 @@ void wxWindowDC::InitDC()
|
||||
SetFont(*pFont);
|
||||
delete pFont;
|
||||
//
|
||||
// OS/2 default vertical character allignment needs to match the other OS's
|
||||
// OS/2 default vertical character alignment needs to match the other OS's
|
||||
//
|
||||
::GpiSetTextAlignment((HPS)GetHPS(), TA_NORMAL_HORIZ, TA_BOTTOM);
|
||||
|
||||
|
||||
@ -77,8 +77,8 @@ bool wxOwnerDrawn::OnMeasureItem(
|
||||
|
||||
//
|
||||
// If we have a valid accel string, then pad out
|
||||
// the menu string so the menu and accel string are not
|
||||
// placed ontop of eachother.
|
||||
// the menu string so that the menu and accel string are not
|
||||
// placed on top of each other.
|
||||
if (!m_strAccel.empty() )
|
||||
{
|
||||
sStr.Pad(sStr.Length()%8);
|
||||
@ -92,7 +92,7 @@ bool wxOwnerDrawn::OnMeasureItem(
|
||||
if (!m_strAccel.IsEmpty())
|
||||
{
|
||||
//
|
||||
// Measure the accelerator string, and add it's width to
|
||||
// Measure the accelerator string, and add its width to
|
||||
// the total item width, plus 16 (Accelerators are right justified,
|
||||
// with the right edge of the text rectangle 16 pixels left of
|
||||
// the right edge of the menu)
|
||||
@ -108,8 +108,8 @@ bool wxOwnerDrawn::OnMeasureItem(
|
||||
}
|
||||
|
||||
//
|
||||
// Add space at the end of the menu for the submenu expansion arrow
|
||||
// this will also allow offsetting the accel string from the right edge
|
||||
// Add space at the end of the menu for the submenu expansion arrow.
|
||||
// This will also allow offsetting the accel string from the right edge
|
||||
//
|
||||
*pWidth = (size_t)(*pWidth + GetDefaultMarginWidth() * 1.5);
|
||||
|
||||
@ -210,7 +210,7 @@ bool wxOwnerDrawn::OnDrawItem(
|
||||
}
|
||||
|
||||
//
|
||||
// Base on the status of the menu item pick the right colors
|
||||
// Based on the status of the menu item, pick the right colors
|
||||
//
|
||||
if (eStatus & wxODSelected)
|
||||
{
|
||||
@ -291,14 +291,14 @@ bool wxOwnerDrawn::OnDrawItem(
|
||||
//
|
||||
// Unfortunately, unlike Win32, PM has no owner drawn specific text
|
||||
// drawing methods like ::DrawState that can cleanly handle accel
|
||||
// pneumonics and deal, automatically, with various states, so we have
|
||||
// mnemonics and deal, automatically, with various states, so we have
|
||||
// to handle them ourselves. Notice Win32 can't handle \t in ownerdrawn
|
||||
// strings either. We cannot handle mneumonics either. We display
|
||||
// it, though, in hopes we can figure it out some day.
|
||||
// strings either. We cannot handle mnemonics either. We display
|
||||
// them, though, in the hope we can figure them out some day.
|
||||
//
|
||||
|
||||
//
|
||||
// Display main text and accel text separately to allign better
|
||||
// Display main text and accel text separately to align better
|
||||
//
|
||||
wxString sTgt = wxT("\t");
|
||||
wxString sFullString = m_strName; // need to save the original text
|
||||
@ -307,7 +307,7 @@ bool wxOwnerDrawn::OnDrawItem(
|
||||
size_t nWidth;
|
||||
size_t nCharWidth;
|
||||
size_t nHeight;
|
||||
bool bFoundMneumonic = FALSE;
|
||||
bool bFoundMnemonic = FALSE;
|
||||
bool bFoundAccel = FALSE;
|
||||
|
||||
//
|
||||
@ -322,7 +322,7 @@ bool wxOwnerDrawn::OnDrawItem(
|
||||
}
|
||||
|
||||
//
|
||||
// Deal with the mneumonic character
|
||||
// Deal with the mnemonic character
|
||||
//
|
||||
sTgt = wxT("~");
|
||||
nIndex = sFullString.Find(sTgt.c_str());
|
||||
@ -330,7 +330,7 @@ bool wxOwnerDrawn::OnDrawItem(
|
||||
{
|
||||
wxString sTmp = sFullString;
|
||||
|
||||
bFoundMneumonic = TRUE;
|
||||
bFoundMnemonic = TRUE;
|
||||
sTmp.Remove(nIndex);
|
||||
rDC.GetTextExtent( sTmp
|
||||
,(long *)&nWidth
|
||||
@ -353,10 +353,10 @@ bool wxOwnerDrawn::OnDrawItem(
|
||||
,sFullString.length()
|
||||
,(PCH)sFullString.c_str()
|
||||
);
|
||||
if (bFoundMneumonic)
|
||||
if (bFoundMnemonic)
|
||||
{
|
||||
//
|
||||
// Underline the mneumonic -- still won't work, but at least it "looks" right
|
||||
// Underline the mnemonic -- still won't work, but at least it "looks" right
|
||||
//
|
||||
wxPen vPen;
|
||||
POINTL vPntEnd = {nX + nWidth + nCharWidth - 3, rRect.y + 2}; //CharWidth is bit wide
|
||||
|
||||
@ -939,7 +939,7 @@ wxBitmap wxDisableBitmap(
|
||||
int j;
|
||||
|
||||
//
|
||||
// Bitmap must be ina double-word alligned address so we may
|
||||
// Bitmap must be in a double-word aligned address so we may
|
||||
// have some padding to worry about
|
||||
//
|
||||
if (nLineBoundary > 0)
|
||||
|
||||
@ -216,7 +216,7 @@ TIFFClientOpen(
|
||||
* The 'L', 'B', and 'H' flags are intended for applications
|
||||
* that can optimize operations on data by using a particular
|
||||
* bit order. By default the library returns data in MSB2LSB
|
||||
* bit order for compatibiltiy with older versions of this
|
||||
* bit order for compatibility with older versions of this
|
||||
* library. Returning data in the bit order of the native cpu
|
||||
* makes the most sense but also requires applications to check
|
||||
* the value of the FillOrder tag; something they probabyl do
|
||||
|
||||
@ -43,7 +43,7 @@
|
||||
* input is assumed to be unsigned linear color values that represent
|
||||
* the range 0-1. In the case of IEEE values, the 0-1 range is assumed to
|
||||
* be the normal linear color range, in addition over 1 values are
|
||||
* accepted up to a value of about 25.0 to encode "hot" hightlights and such.
|
||||
* accepted up to a value of about 25.0 to encode "hot" highlights and such.
|
||||
* The encoding is lossless for 8-bit values, slightly lossy for the
|
||||
* other bit depths. The actual color precision should be better
|
||||
* than the human eye can perceive with extra room to allow for
|
||||
|
||||
@ -576,7 +576,7 @@ void wxComboListBox::OnSelect(wxCommandEvent& event)
|
||||
event2.SetId(m_combo->GetId());
|
||||
m_combo->ProcessEvent(event2);
|
||||
}
|
||||
//else: ignore the events resultign from just moving the mouse initially
|
||||
//else: ignore the events resulting from just moving the mouse initially
|
||||
}
|
||||
|
||||
void wxComboListBox::OnShow()
|
||||
@ -614,7 +614,7 @@ void wxComboListBox::OnMouseMove(wxMouseEvent& event)
|
||||
// while a wxComboListBox is shown, it always has capture, so if it doesn't
|
||||
// we're about to go away anyhow (normally this shouldn't happen at all,
|
||||
// but I don't put assert here as it just might do on other platforms and
|
||||
// it doesn't break anythign anyhow)
|
||||
// it doesn't break anything anyhow)
|
||||
if ( this == wxWindow::GetCapture() )
|
||||
{
|
||||
if ( HitTest(event.GetPosition()) == wxHT_WINDOW_INSIDE )
|
||||
|
||||
@ -256,7 +256,7 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize,
|
||||
int range, int pageSize,
|
||||
bool refresh)
|
||||
{
|
||||
// we only refresh everythign when the range changes, thumb position
|
||||
// we only refresh everything when the range changes, thumb position
|
||||
// changes are handled in OnIdle
|
||||
bool needsRefresh = (range != m_range) ||
|
||||
(thumbSize != m_thumbSize) ||
|
||||
|
||||
@ -22,9 +22,9 @@
|
||||
or right.
|
||||
|
||||
What we really need is probably a more fine grain control on labels, i.e. we
|
||||
should be able to select if we show nothign at all, the current value only
|
||||
should be able to select if we show nothing at all, the current value only
|
||||
or the value and the limits - the current approach is just that of the
|
||||
greatest common denominator.
|
||||
lowest common denominator.
|
||||
|
||||
TODO:
|
||||
|
||||
|
||||
@ -79,8 +79,8 @@ class wxMetalRenderer : public wxDelegateRenderer
|
||||
Arrow_Normal,
|
||||
Arrow_Disabled,
|
||||
Arrow_Pressed,
|
||||
Arrow_Inversed,
|
||||
Arrow_InversedDisabled,
|
||||
Arrow_Inverted,
|
||||
Arrow_InvertedDisabled,
|
||||
Arrow_StateMax
|
||||
};
|
||||
public:
|
||||
@ -366,31 +366,31 @@ wxMetalRenderer::wxMetalRenderer(wxRenderer *renderer, wxColourScheme *scheme)
|
||||
|
||||
}
|
||||
|
||||
// create the inversed bitmap but only for the right arrow as we only
|
||||
// create the inverted bitmap but only for the right arrow as we only
|
||||
// use it for the menus
|
||||
if ( n == Arrow_Right )
|
||||
{
|
||||
m_bmpArrows[Arrow_Inversed][n].Create(w, h);
|
||||
dcInverse.SelectObject(m_bmpArrows[Arrow_Inversed][n]);
|
||||
m_bmpArrows[Arrow_Inverted][n].Create(w, h);
|
||||
dcInverse.SelectObject(m_bmpArrows[Arrow_Inverted][n]);
|
||||
dcInverse.Clear();
|
||||
dcInverse.Blit(0, 0, w, h,
|
||||
&dcNormal, 0, 0,
|
||||
wxXOR);
|
||||
dcInverse.SelectObject(wxNullBitmap);
|
||||
|
||||
mask = new wxMask(m_bmpArrows[Arrow_Inversed][n], *wxBLACK);
|
||||
m_bmpArrows[Arrow_Inversed][n].SetMask(mask);
|
||||
mask = new wxMask(m_bmpArrows[Arrow_Inverted][n], *wxBLACK);
|
||||
m_bmpArrows[Arrow_Inverted][n].SetMask(mask);
|
||||
|
||||
m_bmpArrows[Arrow_InversedDisabled][n].Create(w, h);
|
||||
dcInverse.SelectObject(m_bmpArrows[Arrow_InversedDisabled][n]);
|
||||
m_bmpArrows[Arrow_InvertedDisabled][n].Create(w, h);
|
||||
dcInverse.SelectObject(m_bmpArrows[Arrow_InvertedDisabled][n]);
|
||||
dcInverse.Clear();
|
||||
dcInverse.Blit(0, 0, w, h,
|
||||
&dcDisabled, 0, 0,
|
||||
wxXOR);
|
||||
dcInverse.SelectObject(wxNullBitmap);
|
||||
|
||||
mask = new wxMask(m_bmpArrows[Arrow_InversedDisabled][n], *wxBLACK);
|
||||
m_bmpArrows[Arrow_InversedDisabled][n].SetMask(mask);
|
||||
mask = new wxMask(m_bmpArrows[Arrow_InvertedDisabled][n], *wxBLACK);
|
||||
m_bmpArrows[Arrow_InvertedDisabled][n].SetMask(mask);
|
||||
}
|
||||
|
||||
dcNormal.SelectObject(wxNullBitmap);
|
||||
|
||||
@ -136,8 +136,8 @@ public:
|
||||
Arrow_Normal,
|
||||
Arrow_Disabled,
|
||||
Arrow_Pressed,
|
||||
Arrow_Inversed,
|
||||
Arrow_InversedDisabled,
|
||||
Arrow_Inverted,
|
||||
Arrow_InvertedDisabled,
|
||||
Arrow_StateMax
|
||||
};
|
||||
|
||||
@ -1677,31 +1677,31 @@ wxWin32Renderer::wxWin32Renderer(const wxColourScheme *scheme)
|
||||
|
||||
}
|
||||
|
||||
// create the inversed bitmap but only for the right arrow as we only
|
||||
// create the inverted bitmap but only for the right arrow as we only
|
||||
// use it for the menus
|
||||
if ( n == Arrow_Right )
|
||||
{
|
||||
m_bmpArrows[Arrow_Inversed][n].Create(w, h);
|
||||
dcInverse.SelectObject(m_bmpArrows[Arrow_Inversed][n]);
|
||||
m_bmpArrows[Arrow_Inverted][n].Create(w, h);
|
||||
dcInverse.SelectObject(m_bmpArrows[Arrow_Inverted][n]);
|
||||
dcInverse.Clear();
|
||||
dcInverse.Blit(0, 0, w, h,
|
||||
&dcNormal, 0, 0,
|
||||
wxXOR);
|
||||
dcInverse.SelectObject(wxNullBitmap);
|
||||
|
||||
mask = new wxMask(m_bmpArrows[Arrow_Inversed][n], *wxBLACK);
|
||||
m_bmpArrows[Arrow_Inversed][n].SetMask(mask);
|
||||
mask = new wxMask(m_bmpArrows[Arrow_Inverted][n], *wxBLACK);
|
||||
m_bmpArrows[Arrow_Inverted][n].SetMask(mask);
|
||||
|
||||
m_bmpArrows[Arrow_InversedDisabled][n].Create(w, h);
|
||||
dcInverse.SelectObject(m_bmpArrows[Arrow_InversedDisabled][n]);
|
||||
m_bmpArrows[Arrow_InvertedDisabled][n].Create(w, h);
|
||||
dcInverse.SelectObject(m_bmpArrows[Arrow_InvertedDisabled][n]);
|
||||
dcInverse.Clear();
|
||||
dcInverse.Blit(0, 0, w, h,
|
||||
&dcDisabled, 0, 0,
|
||||
wxXOR);
|
||||
dcInverse.SelectObject(wxNullBitmap);
|
||||
|
||||
mask = new wxMask(m_bmpArrows[Arrow_InversedDisabled][n], *wxBLACK);
|
||||
m_bmpArrows[Arrow_InversedDisabled][n].SetMask(mask);
|
||||
mask = new wxMask(m_bmpArrows[Arrow_InvertedDisabled][n], *wxBLACK);
|
||||
m_bmpArrows[Arrow_InvertedDisabled][n].SetMask(mask);
|
||||
}
|
||||
|
||||
dcNormal.SelectObject(wxNullBitmap);
|
||||
@ -2843,7 +2843,7 @@ void wxWin32Renderer::DrawSliderThumb(wxDC& dc,
|
||||
H D B
|
||||
H D B
|
||||
H D B
|
||||
H D B where H is hightlight colour
|
||||
H D B where H is highlight colour
|
||||
H D B D dark grey
|
||||
H D B B black
|
||||
H D B
|
||||
@ -3197,10 +3197,10 @@ void wxWin32Renderer::DrawMenuItem(wxDC& dc,
|
||||
|
||||
wxArrowStyle arrowStyle;
|
||||
if ( flags & wxCONTROL_DISABLED )
|
||||
arrowStyle = flags & wxCONTROL_SELECTED ? Arrow_InversedDisabled
|
||||
arrowStyle = flags & wxCONTROL_SELECTED ? Arrow_InvertedDisabled
|
||||
: Arrow_Disabled;
|
||||
else if ( flags & wxCONTROL_SELECTED )
|
||||
arrowStyle = Arrow_Inversed;
|
||||
arrowStyle = Arrow_Inverted;
|
||||
else
|
||||
arrowStyle = Arrow_Normal;
|
||||
|
||||
|
||||
@ -591,7 +591,7 @@ void wxToolBar::DoDraw(wxControlRenderer *renderer)
|
||||
|
||||
if (tool->IsSeparator() && !HasFlag(wxTB_FLAT))
|
||||
{
|
||||
// Draw seperators only in flat mode
|
||||
// Draw separators only in flat mode
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
@ -632,7 +632,7 @@ bool GSocket::SetReusable()
|
||||
* For stream (connection oriented) sockets, GSocket_Connect() tries
|
||||
* to establish a client connection to a server using the peer address
|
||||
* as established with GSocket_SetPeer(). Returns GSOCK_NOERROR if the
|
||||
* connection has been succesfully established, or one of the error
|
||||
* connection has been successfully established, or one of the error
|
||||
* codes listed below. Note that for nonblocking sockets, a return
|
||||
* value of GSOCK_WOULDBLOCK doesn't mean a failure. The connection
|
||||
* request can be completed later; you should use GSocket_Select()
|
||||
@ -1092,7 +1092,7 @@ void GSocket::SetTimeout(unsigned long millisec)
|
||||
}
|
||||
|
||||
/* GSocket_GetError:
|
||||
* Returns the last error occured for this socket. Note that successful
|
||||
* Returns the last error occurred for this socket. Note that successful
|
||||
* operations do not clear this back to GSOCK_NOERROR, so use it only
|
||||
* after an error.
|
||||
*/
|
||||
@ -1117,7 +1117,7 @@ GSocketError WXDLLIMPEXP_NET GSocket::GetError()
|
||||
* assume that it can write since the first OUTPUT event, and no more
|
||||
* OUTPUT events will be generated unless an error occurs.
|
||||
* GSOCK_CONNECTION:
|
||||
* Connection succesfully established, for client sockets, or incoming
|
||||
* Connection successfully established, for client sockets, or incoming
|
||||
* client connection, for server sockets. Wait for this event (also watch
|
||||
* out for GSOCK_LOST) after you issue a nonblocking GSocket_Connect() call.
|
||||
* GSOCK_LOST:
|
||||
|
||||
@ -198,7 +198,7 @@ void wxSetIconsX11( WXDisplay* display, WXWindow window,
|
||||
// implements, KDE will support it from version 3.2. At toolkits level,
|
||||
// GTK+ >= 2.1.2 uses it as the only method of making windows fullscreen
|
||||
// (that's why wxGTK will *not* switch to using gtk_window_fullscreen
|
||||
// unless it has better compatiblity with older WMs).
|
||||
// unless it has better compatibility with older WMs).
|
||||
//
|
||||
//
|
||||
// This is what wxWidgets does in wxSetFullScreenStateX11:
|
||||
@ -408,7 +408,7 @@ static void wxSetKDEFullscreen(Display *display, Window rootWnd,
|
||||
lng = 1;
|
||||
}
|
||||
|
||||
// it is neccessary to unmap the window, otherwise kwin will ignore us:
|
||||
// it is necessary to unmap the window, otherwise kwin will ignore us:
|
||||
XSync(display, False);
|
||||
|
||||
bool wasMapped = IsMapped(display, w);
|
||||
@ -435,12 +435,12 @@ static void wxSetKDEFullscreen(Display *display, Window rootWnd,
|
||||
|
||||
if (!fullscreen)
|
||||
{
|
||||
// NB: like many other WMs, kwin ignores first request for window
|
||||
// NB: like many other WMs, kwin ignores the first request for a window
|
||||
// position change after the window was mapped. This additional
|
||||
// move+resize event will ensure that the window is restored in
|
||||
// exactly same position as before it was made fullscreen (because
|
||||
// wxTopLevelWindow::ShowFullScreen will call SetSize, thus
|
||||
// setting the position for second time).
|
||||
// exactly the same position as before it was made fullscreen
|
||||
// (because wxTopLevelWindow::ShowFullScreen will call SetSize, thus
|
||||
// setting the position for the second time).
|
||||
XMoveResizeWindow(display, w,
|
||||
origRect->x, origRect->y,
|
||||
origRect->width, origRect->height);
|
||||
|
||||
@ -368,7 +368,7 @@ public:
|
||||
// or from "pFromSection" if it's not NULL.
|
||||
|
||||
// fopenOptions arg. is string passed to fopen() method,
|
||||
// returns true, if saving was successfull
|
||||
// returns true, if saving was successful
|
||||
|
||||
virtual bool SaveDocument( const char* fname,
|
||||
const char* fopenOptions = "w",
|
||||
|
||||
@ -96,7 +96,7 @@ public:
|
||||
virtual void GetResultString(string& result, MarkupTagsT tags);
|
||||
|
||||
// returns vector of block descriptors, see SPBlockListT definition
|
||||
// (block descriptors can be used for fast custom hightlighted text generation)
|
||||
// (block descriptors can be used for fast custom highlighted text generation)
|
||||
|
||||
SPBlockListT& GetBlocks();
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
#include <limits.h>
|
||||
#include <new.h>
|
||||
|
||||
// VERSION:: 0.2 (copy-constructor/adign-op added)
|
||||
// VERSION:: 0.2 (copy-constructor/assign-op added)
|
||||
|
||||
// FOR NOW:: class-member operators "new" and "delete"
|
||||
// are ignored by list class, memory allocated
|
||||
|
||||
@ -848,7 +848,7 @@ sections. Further jumps can be placed using the commands
|
||||
\rtfsp\commandrefn{label}{label}, \commandrefn{helpref}{helpref},
|
||||
\rtfsp\commandrefn{helprefn}{helprefn}, and \commandrefn{popref}{popref}.
|
||||
Tex2RTF outputs help files that may be read linearly using the
|
||||
\rtfsp$<<$ and $>>$ buttons, and an additonal Up button for
|
||||
\rtfsp$<<$ and $>>$ buttons, with an additional Up button for
|
||||
ease of navigation.
|
||||
|
||||
When writing HTML, multiple files are generated from one \LaTeX\ file
|
||||
@ -924,7 +924,7 @@ With multiple arguments, each should be enclosed in braces.
|
||||
|
||||
Optional arguments are specified using square brackets or parentheses.
|
||||
|
||||
The braces that start command arguments must not be seperated from
|
||||
The braces that start command arguments must not be separated from
|
||||
the other arguments by whitespace. For example, the following produces
|
||||
an error:
|
||||
|
||||
|
||||
@ -205,7 +205,7 @@ int XmlResApp::OnRun()
|
||||
{ wxCMD_LINE_OPTION, _T("n"), _T("function"), _T("C++/Python function name (with -c or -p) [InitXmlResource]"), (wxCmdLineParamType)0, 0 },
|
||||
{ wxCMD_LINE_OPTION, _T("o"), _T("output"), _T("output file [resource.xrs/cpp]"), (wxCmdLineParamType)0, 0 },
|
||||
#if 0 // not yet implemented
|
||||
{ wxCMD_LINE_OPTION, _T("l"), _T("list-of-handlers"), _T("output list of neccessary handlers to this file"), (wxCmdLineParamType)0, 0 },
|
||||
{ wxCMD_LINE_OPTION, _T("l"), _T("list-of-handlers"), _T("output list of necessary handlers to this file"), (wxCmdLineParamType)0, 0 },
|
||||
#endif
|
||||
{ wxCMD_LINE_PARAM, NULL, NULL, _T("input file(s)"),
|
||||
wxCMD_LINE_VAL_STRING,
|
||||
|
||||
@ -1398,7 +1398,7 @@ void wxTreeListHeaderWindow::OnMouse( wxMouseEvent &event )
|
||||
// end of the current column
|
||||
int xpos = 0;
|
||||
|
||||
// find the column where this event occured
|
||||
// find the column where this event occurred
|
||||
int countCol = GetColumnCount();
|
||||
for (int col = 0; col < countCol; col++)
|
||||
{
|
||||
|
||||
@ -937,7 +937,7 @@ class DemoErrorPanel(wx.Panel):
|
||||
self.box = wx.BoxSizer(wx.VERTICAL)
|
||||
|
||||
# Main Label
|
||||
self.box.Add(wx.StaticText(self, -1, "An error has occured while trying to run the demo")
|
||||
self.box.Add(wx.StaticText(self, -1, "An error has occurred while trying to run the demo")
|
||||
, 0, wx.ALIGN_CENTER | wx.TOP, 10)
|
||||
|
||||
# Exception Information
|
||||
@ -1404,7 +1404,7 @@ class wxPythonDemo(wx.Frame):
|
||||
|
||||
# o The RunTest() for all samples must now return a window that can
|
||||
# be palced in a tab in the main notebook.
|
||||
# o If an error occurs (or has occured before) an error tab is created.
|
||||
# o If an error occurs (or has occurred before) an error tab is created.
|
||||
|
||||
if module is not None:
|
||||
wx.LogMessage("Running demo module...")
|
||||
|
||||
@ -107,7 +107,7 @@ class Adb(bdb.Bdb):
|
||||
exc_type_name = exc_type
|
||||
else:
|
||||
exc_type_name = exc_type.__name__
|
||||
message = "Exception occured: " + repr(exc_type_name) + " See locals.__exception__ for details."
|
||||
message = "Exception occurred: " + repr(exc_type_name) + " See locals.__exception__ for details."
|
||||
traceback.print_exception(exc_type, exc_value, exc_traceback)
|
||||
self._harness.interaction(message, frame, message)
|
||||
|
||||
|
||||
@ -1924,7 +1924,7 @@ class IOBuffer:
|
||||
|
||||
self.__buf = ''
|
||||
# A state change is defined as the buffer being closed or a
|
||||
# write occuring.
|
||||
# write occurring.
|
||||
if mutex is not None:
|
||||
self._mutex = mutex
|
||||
else:
|
||||
|
||||
@ -343,7 +343,7 @@ public:
|
||||
wxFileType *GetFileTypeFromMimeType(const wxString& mimeType);
|
||||
|
||||
// other operations: return True if there were no errors or False if there
|
||||
// were some unreckognized entries (the good entries are always read anyhow)
|
||||
// were some unrecognized entries (the good entries are always read anyhow)
|
||||
//
|
||||
|
||||
// read in additional file (the standard ones are read automatically)
|
||||
|
||||
@ -831,7 +831,7 @@ public:
|
||||
// Set HTML page and display it. !! source is HTML document itself,
|
||||
// it is NOT address/filename of HTML document. If you want to
|
||||
// specify document location, use LoadPage() istead
|
||||
// Return value : False if an error occured, True otherwise
|
||||
// Return value : False if an error occurred, True otherwise
|
||||
bool SetPage(const wxString& source);
|
||||
|
||||
// Load HTML page from given location. Location can be either
|
||||
|
||||
@ -1075,7 +1075,7 @@ class FoldPanelBar(wx.Panel):
|
||||
it is resized. Very handy for sizer items, buttons and
|
||||
text boxes.
|
||||
|
||||
* FPB_ALIGN_LEFT: Alligns left instead of fitting the
|
||||
* FPB_ALIGN_LEFT: Aligns left instead of fitting the
|
||||
width of the child window to be added. Use either this
|
||||
one or FPB_ALIGN_WIDTH.
|
||||
|
||||
|
||||
@ -295,7 +295,7 @@ class DocMDIParentFrameMixIn:
|
||||
|
||||
config = wx.ConfigBase_Get()
|
||||
if config.ReadInt("MDIFrameMaximized", False):
|
||||
# wxBug: On maximize, statusbar leaves a residual that needs to be refereshed, happens even when user does it
|
||||
# wxBug: On maximize, statusbar leaves a residual that needs to be refreshed, happens even when user does it
|
||||
self.Maximize()
|
||||
|
||||
self.CreateEmbeddedWindows(embeddedWindows)
|
||||
|
||||
@ -622,7 +622,7 @@ class XML_Tree(wxTreeCtrl):
|
||||
g.panel.SetData(xxx)
|
||||
# Update tools
|
||||
g.tools.UpdateUI()
|
||||
# Hightlighting is done in OnIdle
|
||||
# Highlighting is done in OnIdle
|
||||
self.pendingHighLight = self.selection
|
||||
|
||||
# Check if item is in testWin subtree
|
||||
@ -648,7 +648,7 @@ class XML_Tree(wxTreeCtrl):
|
||||
obj, pos = self.FindNodeObject(item), self.FindNodePos(item)
|
||||
size = obj.GetSize()
|
||||
# Highlight
|
||||
# Nagative positions are not working wuite well
|
||||
# Negative positions are not working quite well
|
||||
if g.testWin.highLight:
|
||||
g.testWin.highLight.Replace(pos, size)
|
||||
else:
|
||||
@ -670,7 +670,7 @@ class XML_Tree(wxTreeCtrl):
|
||||
if g.testWin: # Reset old
|
||||
self.SetItemBold(g.testWin.item, False)
|
||||
self.CreateTestWin(item)
|
||||
# Maybe an error occured, so we need to test
|
||||
# Maybe an error occurred, so we need to test
|
||||
if g.testWin: self.SetItemBold(g.testWin.item)
|
||||
|
||||
# Double-click on Linux
|
||||
|
||||
@ -100,7 +100,7 @@ class Frame(wxFrame):
|
||||
|
||||
# Load our own resources
|
||||
self.res = wxXmlResource('')
|
||||
# !!! Blocking of assert failure occuring in older unicode builds
|
||||
# !!! Blocking of assert failure occurring in older unicode builds
|
||||
try:
|
||||
self.res.Load(os.path.join(basePath, 'xrced.xrc'))
|
||||
except wx._core.PyAssertionError:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user