Spelling fixes from Andreas Mohr (patch #1360064)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -540,11 +540,11 @@ protected:
|
||||
Yes
|
||||
} m_exitOnFrameDelete;
|
||||
|
||||
// true if the apps whats to use the best visual on systems where
|
||||
// true if the app wants to use the best visual on systems where
|
||||
// more than one are available (Sun, SGI, XFree86 4.0 ?)
|
||||
bool m_useBestVisual;
|
||||
|
||||
// does any of our windows has focus?
|
||||
// does any of our windows have focus?
|
||||
bool m_isActive;
|
||||
|
||||
|
||||
@@ -635,7 +635,7 @@ public:
|
||||
#define IMPLEMENT_WXWIN_MAIN_CONSOLE \
|
||||
int main(int argc, char **argv) { return wxEntry(argc, argv); }
|
||||
|
||||
// port-specific header could have defined it already in some special wau
|
||||
// port-specific header could have defined it already in some special way
|
||||
#ifndef IMPLEMENT_WXWIN_MAIN
|
||||
#define IMPLEMENT_WXWIN_MAIN IMPLEMENT_WXWIN_MAIN_CONSOLE
|
||||
#endif // defined(IMPLEMENT_WXWIN_MAIN)
|
||||
|
@@ -376,10 +376,10 @@ struct WXDLLIMPEXP_ODBC wxDbSqlTypeInfo
|
||||
class WXDLLIMPEXP_ODBC wxDbColFor
|
||||
{
|
||||
public:
|
||||
wxString s_Field; // Formated String for Output
|
||||
wxString s_Format[7]; // Formated Objects - TIMESTAMP has the biggest (7)
|
||||
wxString s_Amount[7]; // Formated Objects - amount of things that can be formatted
|
||||
int i_Amount[7]; // Formated Objects - TT MM YYYY HH MM SS m
|
||||
wxString s_Field; // Formatted String for Output
|
||||
wxString s_Format[7]; // Formatted Objects - TIMESTAMP has the biggest (7)
|
||||
wxString s_Amount[7]; // Formatted Objects - amount of things that can be formatted
|
||||
int i_Amount[7]; // Formatted Objects - TT MM YYYY HH MM SS m
|
||||
int i_Nation; // 0 = timestamp , 1=EU, 2=UK, 3=International, 4=US
|
||||
int i_dbDataType; // conversion of the 'sqlDataType' to the generic data type used by these classes
|
||||
SWORD i_sqlDataType;
|
||||
|
@@ -79,7 +79,7 @@ public:
|
||||
// remove all pages
|
||||
bool DeleteAllPages();
|
||||
|
||||
// adds a new page to the notebook (it will be deleted ny the notebook,
|
||||
// adds a new page to the notebook (it will be deleted by the notebook,
|
||||
// don't delete it yourself). If bSelect, this page becomes active.
|
||||
// the same as AddPage(), but adds it at the specified position
|
||||
bool InsertPage( size_t position,
|
||||
|
@@ -130,7 +130,7 @@ public:
|
||||
void OnIdle(wxIdleEvent& WXUNUSED(event)) {}
|
||||
|
||||
// wxGTK-specific: called recursively by Enable,
|
||||
// to give widgets an oppprtunity to correct their colours after they
|
||||
// to give widgets an opportunity to correct their colours after they
|
||||
// have been changed by Enable
|
||||
virtual void OnParentEnable( bool WXUNUSED(enable) ) {}
|
||||
|
||||
@@ -153,7 +153,7 @@ public:
|
||||
// The methods below are required because many native widgets
|
||||
// are composed of several subwidgets and setting a style for
|
||||
// the widget means setting it for all subwidgets as well.
|
||||
// also, it is nor clear, which native widget is the top
|
||||
// also, it is not clear which native widget is the top
|
||||
// widget where (most of) the input goes. even tooltips have
|
||||
// to be applied to all subwidgets.
|
||||
virtual GtkWidget* GetConnectWidget();
|
||||
@@ -182,7 +182,7 @@ public:
|
||||
// scrolbar in sync (this does not generate any wx events)
|
||||
void GtkUpdateScrollbar(int orient);
|
||||
|
||||
// Called from GTK signales handlers. it indicates that
|
||||
// Called from GTK signal handlers. it indicates that
|
||||
// the layouting functions have to be called later on
|
||||
// (i.e. in idle time, implemented in OnInternalIdle() ).
|
||||
void GtkUpdateSize() { m_sizeSet = false; }
|
||||
|
@@ -79,7 +79,7 @@ public:
|
||||
// remove all pages
|
||||
bool DeleteAllPages();
|
||||
|
||||
// adds a new page to the notebook (it will be deleted ny the notebook,
|
||||
// adds a new page to the notebook (it will be deleted by the notebook,
|
||||
// don't delete it yourself). If bSelect, this page becomes active.
|
||||
// the same as AddPage(), but adds it at the specified position
|
||||
bool InsertPage( size_t position,
|
||||
|
@@ -130,7 +130,7 @@ public:
|
||||
void OnIdle(wxIdleEvent& WXUNUSED(event)) {}
|
||||
|
||||
// wxGTK-specific: called recursively by Enable,
|
||||
// to give widgets an oppprtunity to correct their colours after they
|
||||
// to give widgets an opportunity to correct their colours after they
|
||||
// have been changed by Enable
|
||||
virtual void OnParentEnable( bool WXUNUSED(enable) ) {}
|
||||
|
||||
@@ -153,7 +153,7 @@ public:
|
||||
// The methods below are required because many native widgets
|
||||
// are composed of several subwidgets and setting a style for
|
||||
// the widget means setting it for all subwidgets as well.
|
||||
// also, it is nor clear, which native widget is the top
|
||||
// also, it is not clear which native widget is the top
|
||||
// widget where (most of) the input goes. even tooltips have
|
||||
// to be applied to all subwidgets.
|
||||
virtual GtkWidget* GetConnectWidget();
|
||||
@@ -182,7 +182,7 @@ public:
|
||||
// scrolbar in sync (this does not generate any wx events)
|
||||
void GtkUpdateScrollbar(int orient);
|
||||
|
||||
// Called from GTK signales handlers. it indicates that
|
||||
// Called from GTK signal handlers. it indicates that
|
||||
// the layouting functions have to be called later on
|
||||
// (i.e. in idle time, implemented in OnInternalIdle() ).
|
||||
void GtkUpdateSize() { m_sizeSet = false; }
|
||||
|
@@ -151,7 +151,7 @@ public:
|
||||
// convert to native long long
|
||||
wxLongLong_t GetValue() const { return m_ll; }
|
||||
|
||||
// convert to long with range checking in the debug mode (only!)
|
||||
// convert to long with range checking in debug mode (only!)
|
||||
long ToLong() const
|
||||
{
|
||||
wxASSERT_MSG( (m_ll >= LONG_MIN) && (m_ll <= LONG_MAX),
|
||||
@@ -350,7 +350,7 @@ public:
|
||||
// convert to native ulong long
|
||||
wxULongLong_t GetValue() const { return m_ll; }
|
||||
|
||||
// convert to ulong with range checking in the debug mode (only!)
|
||||
// convert to ulong with range checking in debug mode (only!)
|
||||
unsigned long ToULong() const
|
||||
{
|
||||
wxASSERT_MSG( m_ll <= LONG_MAX,
|
||||
@@ -580,7 +580,7 @@ public:
|
||||
return *this;
|
||||
}
|
||||
|
||||
// convert to long with range checking in the debug mode (only!)
|
||||
// convert to long with range checking in debug mode (only!)
|
||||
long ToLong() const
|
||||
{
|
||||
wxASSERT_MSG( (m_hi == 0l) || (m_hi == -1l),
|
||||
@@ -778,7 +778,7 @@ public:
|
||||
// get low part
|
||||
unsigned long GetLo() const { return m_lo; }
|
||||
|
||||
// convert to long with range checking in the debug mode (only!)
|
||||
// convert to long with range checking in debug mode (only!)
|
||||
unsigned long ToULong() const
|
||||
{
|
||||
wxASSERT_MSG( m_hi == 0ul,
|
||||
|
@@ -262,7 +262,7 @@ protected:
|
||||
// initializes the string to the empty value (must be called only from
|
||||
// ctors, use Reinit() otherwise)
|
||||
void Init() { m_pchData = (wxChar *)wxEmptyString; }
|
||||
// initializaes the string with (a part of) C-string
|
||||
// initializes the string with (a part of) C-string
|
||||
void InitWith(const wxChar *psz, size_t nPos = 0, size_t nLen = npos);
|
||||
// as Init, but also frees old data
|
||||
void Reinit() { GetStringData()->Unlock(); Init(); }
|
||||
@@ -1075,7 +1075,7 @@ public:
|
||||
// convert to a double
|
||||
bool ToDouble(double *val) const;
|
||||
|
||||
// formated input/output
|
||||
// formatted input/output
|
||||
// as sprintf(), returns the number of characters written or < 0 on error
|
||||
// (take 'this' into account in attribute parameter count)
|
||||
int Printf(const wxChar *pszFormat, ...) ATTRIBUTE_PRINTF_2;
|
||||
|
@@ -324,19 +324,19 @@ public:
|
||||
wxCondError Wait();
|
||||
|
||||
// exactly as Wait() except that it may also return if the specified
|
||||
// timeout ellapses even if the condition hasn't been signalled: in this
|
||||
// timeout elapses even if the condition hasn't been signalled: in this
|
||||
// case, the return value is false, otherwise (i.e. in case of a normal
|
||||
// return) it is true
|
||||
//
|
||||
// the timeeout parameter specifies a interval that needs to be waited in
|
||||
// milliseconds
|
||||
// the timeout parameter specifies an interval that needs to be waited for
|
||||
// in milliseconds
|
||||
wxCondError WaitTimeout(unsigned long milliseconds);
|
||||
|
||||
// NB: the associated mutex may or may not be locked by the calling thread
|
||||
//
|
||||
// this method unblocks one thread if any are blocking on the condition.
|
||||
// if no thread is blocking in Wait(), then the signal is NOT remembered
|
||||
// The thread which was blocking on Wait(), will then reacquire the lock
|
||||
// The thread which was blocking on Wait() will then reacquire the lock
|
||||
// on the associated mutex object before returning
|
||||
wxCondError Signal();
|
||||
|
||||
@@ -344,7 +344,7 @@ public:
|
||||
//
|
||||
// this method unblocks all threads if any are blocking on the condition.
|
||||
// if no thread is blocking in Wait(), then the signal is NOT remembered
|
||||
// The threads which were blocking on Wait(), will then reacquire the lock
|
||||
// The threads which were blocking on Wait() will then reacquire the lock
|
||||
// on the associated mutex object before returning.
|
||||
wxCondError Broadcast();
|
||||
|
||||
@@ -387,7 +387,7 @@ public:
|
||||
wxSemaError TryWait();
|
||||
|
||||
// same as Wait(), but as a timeout limit, returns wxSEMA_NO_ERROR if the
|
||||
// semaphore was acquired and wxSEMA_TIMEOUT if the timeout has ellapsed
|
||||
// semaphore was acquired and wxSEMA_TIMEOUT if the timeout has elapsed
|
||||
wxSemaError WaitTimeout(unsigned long milliseconds);
|
||||
|
||||
// increments the semaphore count and signals one of the waiting threads
|
||||
@@ -436,7 +436,7 @@ public:
|
||||
// Returns true if current thread is the main thread.
|
||||
static bool IsMain();
|
||||
|
||||
// Release the rest of our time slice leting the other threads run
|
||||
// Release the rest of our time slice letting the other threads run
|
||||
static void Yield();
|
||||
|
||||
// Sleep during the specified period of time in milliseconds
|
||||
@@ -502,9 +502,9 @@ public:
|
||||
ExitCode Wait();
|
||||
|
||||
// kills the thread without giving it any chance to clean up - should
|
||||
// not be used in normal circumstances, use Delete() instead. It is a
|
||||
// dangerous function that should only be used in the most extreme
|
||||
// cases!
|
||||
// not be used under normal circumstances, use Delete() instead.
|
||||
// It is a dangerous function that should only be used in the most
|
||||
// extreme cases!
|
||||
//
|
||||
// The wxThread object is deleted by Kill() if the thread is
|
||||
// detachable, but you still have to delete it manually for joinable
|
||||
|
@@ -956,7 +956,7 @@ public:
|
||||
void DeleteRelatedConstraints();
|
||||
void ResetConstraints();
|
||||
|
||||
// these methods may be overriden for special layout algorithms
|
||||
// these methods may be overridden for special layout algorithms
|
||||
virtual void SetConstraintSizes(bool recurse = true);
|
||||
virtual bool LayoutPhase1(int *noChanges);
|
||||
virtual bool LayoutPhase2(int *noChanges);
|
||||
|
Reference in New Issue
Block a user