mirror of
https://github.com/wxWidgets/wxWidgets.git
synced 2026-09-23 23:13:12 +08:00
Fix comment typos in sources
No real changes. Closes https://github.com/wxWidgets/wxWidgets/pull/2541
This commit is contained in:
committed by
Vadim Zeitlin
parent
cfdd4127b5
commit
668a2186cd
+1
-1
@@ -100,7 +100,7 @@ public:
|
||||
// string <-> wxAcceleratorEntry conversion
|
||||
// ----------------------------------------
|
||||
|
||||
// returns a wxString for the this accelerator.
|
||||
// returns a wxString for this accelerator.
|
||||
// this function formats it using the <flags>-<keycode> format
|
||||
// where <flags> maybe a hyphen-separated list of "shift|alt|ctrl"
|
||||
wxString ToString() const { return AsPossiblyLocalizedString(true); }
|
||||
|
||||
@@ -1057,7 +1057,7 @@
|
||||
// Default is 1.
|
||||
//
|
||||
// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it
|
||||
// it used by wxComboBox
|
||||
// is used by wxComboBox
|
||||
#define wxUSE_COMBOCTRL 1
|
||||
|
||||
// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox
|
||||
|
||||
@@ -28,7 +28,7 @@ class WXDLLIMPEXP_FWD_CORE wxImage;
|
||||
object converting from the format-specific data representation to the
|
||||
wxImage native format (RGB24).
|
||||
wxAnimationDecoders always load an input stream using some optimized format
|
||||
to store it which is format-depedent. This allows to store a (possibly big)
|
||||
to store it which is format-dependent. This allows to store a (possibly big)
|
||||
animation using a format which is a good compromise between required memory
|
||||
and time required to blit it on the screen.
|
||||
|
||||
|
||||
+1
-1
@@ -148,7 +148,7 @@ private:
|
||||
/**
|
||||
Helper macro for defining user value types.
|
||||
|
||||
Even though C++ RTTI would be fully available to use, we'd have to to
|
||||
Even though C++ RTTI would be fully available to use, we'd have to
|
||||
facilitate sub-type system which allows, for instance, wxAny with
|
||||
signed short '15' to be treated equal to wxAny with signed long long '15'.
|
||||
Having sm_instance is important here.
|
||||
|
||||
+2
-2
@@ -106,7 +106,7 @@ public:
|
||||
// surrogates as we do for now)
|
||||
//
|
||||
// just remember that this works as long as wxString keeps an internal
|
||||
// buffer with its wide wide char representation, just as with AsChar()
|
||||
// buffer with its wide char representation, just as with AsChar()
|
||||
// above
|
||||
return m_str->c_str().AsWChar() + (m_iter - m_str->begin());
|
||||
}
|
||||
@@ -114,7 +114,7 @@ public:
|
||||
// Because the objects of this class are only used as return type for
|
||||
// functions which can return NULL we can skip providing dereferencing
|
||||
// operators: the code using this class must test it for NULL first and if
|
||||
// it does anything else with it it has to assign it to either char* or
|
||||
// it does anything else with it has to assign it to either char* or
|
||||
// wchar_t* itself, before dereferencing.
|
||||
//
|
||||
// IOW this
|
||||
|
||||
@@ -80,7 +80,7 @@ private:
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// wxArchiveInputStream
|
||||
//
|
||||
// GetNextEntry() returns an wxArchiveEntry object containing the meta-data
|
||||
// GetNextEntry() returns a wxArchiveEntry object containing the meta-data
|
||||
// for the next entry in the archive (and gives away ownership). Reading from
|
||||
// the wxArchiveInputStream then returns the entry's data. Eof() becomes true
|
||||
// after an attempt has been made to read past the end of the entry's data.
|
||||
|
||||
@@ -486,7 +486,7 @@ public:
|
||||
|
||||
public:
|
||||
|
||||
// deprecated -- please use SetManagedWindow() and
|
||||
// deprecated -- please use SetManagedWindow()
|
||||
// and GetManagedWindow() instead
|
||||
|
||||
wxDEPRECATED( void SetFrame(wxFrame* frame) );
|
||||
|
||||
@@ -73,7 +73,7 @@ public:
|
||||
wxWindowID winid,
|
||||
const wxString& name = wxString());
|
||||
|
||||
which is used used by NewCloseButton(), and, as Create(), must be
|
||||
which is used by NewCloseButton(), and, as Create(), must be
|
||||
called on default-constructed wxBitmapButton object.
|
||||
*/
|
||||
|
||||
|
||||
@@ -1070,7 +1070,7 @@ public:
|
||||
// if the overloads above were used.
|
||||
//
|
||||
// And then we also have to provide the overloads for wxCStrData, as usual.
|
||||
// Unfortunately those ones can't return anything as we don't have any
|
||||
// Unfortunately those can't return anything as we don't have any
|
||||
// sufficiently long-lived wxAnyStrPtr to return from them: any temporary
|
||||
// strings it would point to would be destroyed when this function returns
|
||||
// making it impossible to dereference the return value. So we just don't
|
||||
|
||||
+1
-1
@@ -522,7 +522,7 @@ typedef short int WXTYPE;
|
||||
#define wxC_CALLING_CONV
|
||||
#endif /* compiler */
|
||||
|
||||
/* callling convention for the qsort(3) callback */
|
||||
/* calling convention for the qsort(3) callback */
|
||||
#define wxCMPFUNC_CONV wxC_CALLING_CONV
|
||||
|
||||
/* compatibility :-( */
|
||||
|
||||
+2
-2
@@ -66,7 +66,7 @@ public:
|
||||
// parameter to Dial() on this machine and returns their number (may be 0)
|
||||
virtual size_t GetISPNames(wxArrayString& names) const = 0;
|
||||
|
||||
// dial the given ISP, use username and password to authentificate
|
||||
// dial the given ISP, use username and password to authenticate
|
||||
//
|
||||
// if no nameOfISP is given, the function will select the default one
|
||||
//
|
||||
@@ -122,7 +122,7 @@ public:
|
||||
// wxEVT_DIALUP_CONNECTED/wxEVT_DIALUP_DISCONNECTED events. The interval
|
||||
// parameter is only for Unix where we do the check manually: under
|
||||
// Windows, the notification about the change of connection status is
|
||||
// instantenous.
|
||||
// instantaneous.
|
||||
//
|
||||
// Returns false if couldn't set up automatic check for online status.
|
||||
virtual bool EnableAutoCheckOnlineStatus(size_t nSeconds = 60) = 0;
|
||||
|
||||
@@ -445,7 +445,7 @@ private:
|
||||
// under Windows if needed.
|
||||
//
|
||||
// The first (just EXPORTED) macros do it if wxWidgets was compiled as a DLL
|
||||
// and so must be used used inside the library. The second kind (USER_EXPORTED)
|
||||
// and so must be used inside the library. The second kind (USER_EXPORTED)
|
||||
// allow the user code to do it when it wants. This is needed if you have a dll
|
||||
// that wants to export a wxArray daubed with your own import/export goo.
|
||||
//
|
||||
@@ -615,7 +615,7 @@ private:
|
||||
// 2) Detach() just removes the object from the array (returning pointer to it)
|
||||
//
|
||||
// NB1: Base type T should have an accessible copy ctor if Add(T&) is used
|
||||
// NB2: Never ever cast a array to it's base type: as dtor is not virtual
|
||||
// NB2: Never ever cast an array to it's base type: as dtor is not virtual
|
||||
// and so you risk having at least the memory leaks and probably worse
|
||||
//
|
||||
// Some functions of this class are not inline, so it takes some space to
|
||||
@@ -631,7 +631,7 @@ private:
|
||||
// This is necessary because at the moment of DEFINE_OBJARRAY class parsing the
|
||||
// element_type must be fully defined (i.e. forward declaration is not
|
||||
// enough), while WX_DECLARE_OBJARRAY may be done anywhere. The separation of
|
||||
// two allows to break cicrcular dependencies with classes which have member
|
||||
// two allows to break circcular dependencies with classes which have member
|
||||
// variables of objarray type.
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ typedef wxDLManifest wxDLImports;
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
// NOTE: Do not attempt to use a base class pointer to this class.
|
||||
// wxDL is not virtual and we deliberately hide some of it's
|
||||
// wxDL is not virtual and we deliberately hide some of its
|
||||
// methods here.
|
||||
//
|
||||
// Unless you know exactly why you need to, you probably shouldn't
|
||||
|
||||
+2
-2
@@ -1692,7 +1692,7 @@ private:
|
||||
};
|
||||
|
||||
|
||||
// Scroll event class, derived form wxCommandEvent. wxScrollEvents are
|
||||
// Scroll event class, derived from wxCommandEvent. wxScrollEvents are
|
||||
// sent by wxSlider and wxScrollBar.
|
||||
/*
|
||||
wxEVT_SCROLL_TOP
|
||||
@@ -3086,7 +3086,7 @@ private:
|
||||
|
||||
/*
|
||||
wxEVT_MOUSE_CAPTURE_LOST
|
||||
The window losing the capture receives this message, unless it released it
|
||||
The window losing the capture receives this message, unless it released
|
||||
it itself or unless wxWindow::CaptureMouse was called on another window
|
||||
(and so capture will be restored when the new capturer releases it).
|
||||
*/
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
|
||||
It's important to note that YieldFor() is used to selectively process the
|
||||
events generated by the NATIVE toolkit.
|
||||
Events syntethized by wxWidgets code or by user code are instead selectively
|
||||
Events synthesized by wxWidgets code or by user code are instead selectively
|
||||
processed thanks to the logic built into wxEvtHandler::ProcessPendingEvents().
|
||||
In fact, when wxEvtHandler::ProcessPendingEvents gets called from inside a
|
||||
YieldFor() call, wxEventLoopBase::IsEventAllowedInsideYield is used to decide
|
||||
|
||||
@@ -495,7 +495,7 @@ public:
|
||||
// is the char a path separator for this format?
|
||||
static bool IsPathSeparator(wxChar ch, wxPathFormat format = wxPATH_NATIVE);
|
||||
|
||||
// is this is a DOS path which beings with a windows unique volume name
|
||||
// is this is a DOS path which begins with a windows unique volume name
|
||||
// ('\\?\Volume{guid}\')?
|
||||
static bool IsMSWUniqueVolumeNamePath(const wxString& path,
|
||||
wxPathFormat format = wxPATH_NATIVE);
|
||||
|
||||
@@ -95,7 +95,7 @@ protected:
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxFontPickerCtrl: platform-independent class which embeds the
|
||||
// platform-dependent wxFontPickerWidget andm if wxFNTP_USE_TEXTCTRL style is
|
||||
// platform-dependent wxFontPickerWidget and if wxFNTP_USE_TEXTCTRL style is
|
||||
// used, a textctrl next to it.
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
|
||||
+3
-3
@@ -834,7 +834,7 @@ public:
|
||||
return r;
|
||||
}
|
||||
|
||||
// return true if the point is (not strcitly) inside the rect
|
||||
// return true if the point is (not strictly) inside the rect
|
||||
bool Contains(int x, int y) const;
|
||||
bool Contains(const wxPoint& pt) const { return Contains(pt.x, pt.y); }
|
||||
// return true if the rectangle 'rect' is (not strictly) inside this rect
|
||||
@@ -846,7 +846,7 @@ public:
|
||||
// like Union() but don't ignore empty rectangles
|
||||
wxRect& operator+=(const wxRect& rect);
|
||||
|
||||
// intersections of two rectrangles not testing for empty rectangles
|
||||
// intersections of two rectangles not testing for empty rectangles
|
||||
wxRect& operator*=(const wxRect& rect);
|
||||
|
||||
// centre this rectangle in the given (usually, but not necessarily,
|
||||
@@ -948,7 +948,7 @@ public:
|
||||
|
||||
wxStockGDI creates the stock GDI objects on demand. Pointers to the
|
||||
created objects are stored in the ms_stockObject array, which is indexed
|
||||
by the Item enum values. Platorm-specific fonts can be created by
|
||||
by the Item enum values. Platform-specific fonts can be created by
|
||||
implementing a derived class with an override for the GetFont function.
|
||||
wxStockGDI operates as a singleton, accessed through the ms_instance
|
||||
pointer. By default this pointer is set to an instance of wxStockGDI.
|
||||
|
||||
@@ -71,7 +71,7 @@ public:
|
||||
|
||||
// Extend (or shrink) the current selection block (creating it if
|
||||
// necessary, i.e. if there is no selection at all currently or if the
|
||||
// current current cell isn't selected, as in this case a new block
|
||||
// current cell isn't selected, as in this case a new block
|
||||
// containing it is always added) to the one specified by the start and end
|
||||
// coordinates of its opposite corners (which don't have to be in
|
||||
// top/bottom left/right order).
|
||||
|
||||
@@ -188,7 +188,7 @@ private:
|
||||
*m_remaining;
|
||||
|
||||
// Reference to the parent top level window, automatically becomes NULL if
|
||||
// it it is destroyed and could be always NULL if it's not given at all.
|
||||
// it is destroyed and could be always NULL if it's not given at all.
|
||||
wxWindowRef m_parentTop;
|
||||
|
||||
// Progress dialog styles: this is not the same as m_windowStyle because
|
||||
|
||||
@@ -478,7 +478,7 @@ inline wxPoint2DDouble operator/(const wxPoint2DDouble& pt , wxInt32 n)
|
||||
return wxPoint2DDouble( pt.m_x / n , pt.m_y / n );
|
||||
}
|
||||
|
||||
// wxRect2Ds are a axis-aligned rectangles, each side of the rect is parallel to the x- or m_y- axis. The rectangle is either defined by the
|
||||
// wxRect2Ds are an axis-aligned rectangles, each side of the rect is parallel to the x- or m_y- axis. The rectangle is either defined by the
|
||||
// top left and bottom right corner, or by the top left corner and size. A point is contained within the rectangle if
|
||||
// left <= x < right and top <= m_y < bottom , thus it is a half open interval.
|
||||
|
||||
|
||||
@@ -162,7 +162,7 @@ public:
|
||||
wxGLAttributes& FrameBuffersRGB();
|
||||
void EndList(); // No more values can be chained
|
||||
|
||||
// This function is undocumented and can not be chained on purpose!
|
||||
// This function is undocumented and cannot be chained on purpose!
|
||||
// To keep backwards compatibility with versions before wx3.1 we add here
|
||||
// the default values used in those versions for the case of NULL list.
|
||||
void AddDefaultsForWXBefore31();
|
||||
|
||||
@@ -26,7 +26,7 @@ public:
|
||||
virtual ~wxMemoryDCImpl();
|
||||
|
||||
// these get reimplemented for mono-bitmaps to behave
|
||||
// more like their Win32 couterparts. They now interpret
|
||||
// more like their Win32 counterparts. They now interpret
|
||||
// wxWHITE, wxWHITE_BRUSH and wxWHITE_PEN as drawing 0
|
||||
// and everything else as drawing 1.
|
||||
virtual void SetPen( const wxPen &pen ) wxOVERRIDE;
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
// In other words, it isn't guaranteed to map to Meta. This is a real
|
||||
// problem: it is common to map NumLock to it (in fact, it's an exception
|
||||
// if the X server _doesn't_ use it for NumLock). So the old code caused
|
||||
// wxKeyEvent::MetaDown() to always return true as long as NumLock was on
|
||||
// wxKeyEvent::MetaDown() to always return true as long as NumLock was
|
||||
// on many systems, which broke all applications using
|
||||
// wxKeyEvent::GetModifiers() to check modifiers state (see e.g. here:
|
||||
// http://tinyurl.com/56lsk2).
|
||||
|
||||
@@ -1058,7 +1058,7 @@
|
||||
// Default is 1.
|
||||
//
|
||||
// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it
|
||||
// it used by wxComboBox
|
||||
// is used by wxComboBox
|
||||
#define wxUSE_COMBOCTRL 1
|
||||
|
||||
// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox
|
||||
|
||||
@@ -182,7 +182,7 @@ public:
|
||||
bool GTKShouldIgnoreEvent() const;
|
||||
|
||||
|
||||
// override this if some events should never be consumed by wxWidgets but
|
||||
// override this if some events should never be consumed by wxWidgets
|
||||
// but have to be left for the native control
|
||||
//
|
||||
// base version just calls HandleWindowEvent()
|
||||
|
||||
@@ -54,7 +54,7 @@ private:
|
||||
wxDECLARE_ABSTRACT_CLASS(wxDC);
|
||||
};
|
||||
|
||||
// this must be defined when wxDC::Blit() honours the DC origian and needed to
|
||||
// this must be defined when wxDC::Blit() honours the DC origin and needed to
|
||||
// allow wxUniv code in univ/winuniv.cpp to work with versions of wxGTK
|
||||
// 2.3.[23]
|
||||
#ifndef wxHAS_WORKING_GTK_DC_BLIT
|
||||
|
||||
@@ -295,7 +295,7 @@ public:
|
||||
//
|
||||
// 'window' is pointer to wxHtmlWindowInterface of the window which
|
||||
// generated the event.
|
||||
// HINT: if this handling is not enough for you you should use
|
||||
// HINT: if this handling is not enough for you should use
|
||||
// wxHtmlWidgetCell
|
||||
virtual bool ProcessMouseClick(wxHtmlWindowInterface *window,
|
||||
const wxPoint& pos,
|
||||
|
||||
@@ -39,7 +39,7 @@ public:
|
||||
wxHtmlTagsCache(const wxString& source);
|
||||
virtual ~wxHtmlTagsCache();
|
||||
|
||||
// Finds parameters for tag starting at at and fills the variables
|
||||
// Finds parameters for tag starting at and fills the variables
|
||||
void QueryTag(const wxString::const_iterator& at,
|
||||
const wxString::const_iterator& inputEnd,
|
||||
wxString::const_iterator *end1,
|
||||
|
||||
+1
-1
@@ -28,7 +28,7 @@
|
||||
#if wxUSE_CONSTRAINTS
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// forward declrations
|
||||
// forward declarations
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_FWD_CORE wxWindowBase;
|
||||
|
||||
@@ -1058,7 +1058,7 @@
|
||||
// Default is 1.
|
||||
//
|
||||
// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it
|
||||
// it used by wxComboBox
|
||||
// is used by wxComboBox
|
||||
#define wxUSE_COMBOCTRL 1
|
||||
|
||||
// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox
|
||||
|
||||
@@ -131,7 +131,7 @@ public:
|
||||
// (for wxWindowDC and Motif callbacks only)
|
||||
// -----------------------------------------
|
||||
|
||||
// Adds a recangle to the updates list
|
||||
// Adds a rectangle to the updates list
|
||||
void AddUpdateRect(int x, int y, int w, int h);
|
||||
|
||||
void ClearUpdateRegion() { m_updateRegion.Clear(); }
|
||||
|
||||
@@ -49,7 +49,7 @@ public:
|
||||
wxDIB(HBITMAP hbmp)
|
||||
{ Init(); (void)Create(hbmp); }
|
||||
|
||||
// load a DIB from file (any depth is supoprted here unlike above)
|
||||
// load a DIB from file (any depth is supported here unlike above)
|
||||
//
|
||||
// as above, use IsOk() to see if the bitmap was loaded successfully
|
||||
wxDIB(const wxString& filename)
|
||||
|
||||
@@ -155,7 +155,7 @@ protected:
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxEnhMetaFileSimpleDataObject does derive from wxDataObjectSimple which
|
||||
// makes it more convenient to use (it can be used with wxDataObjectComposite)
|
||||
// at the price of not supoprting any more CF_METAFILEPICT but only
|
||||
// at the price of not supporting any more CF_METAFILEPICT but only
|
||||
// CF_ENHMETAFILE
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -96,7 +96,7 @@ public:
|
||||
|
||||
// Uses DISPATCH_PROPERTYGET
|
||||
// and returns a dispatch pointer. The calling code should call Release
|
||||
// on the pointer, though this could be implicit by constructing an wxAutomationObject
|
||||
// on the pointer, though this could be implicit by constructing a wxAutomationObject
|
||||
// with it and letting the destructor call Release.
|
||||
WXIDISPATCH* GetDispatchProperty(const wxString& property, int noArgs, wxVariant args[]) const;
|
||||
WXIDISPATCH* GetDispatchProperty(const wxString& property, int noArgs, const wxVariant **args) const;
|
||||
|
||||
@@ -297,7 +297,7 @@ public:
|
||||
|
||||
protected:
|
||||
// structure to hold information needed to process one native event
|
||||
// this is just a dummy holder, so it doesn't take ownership of it's data
|
||||
// this is just a dummy holder, so it doesn't take ownership of its data
|
||||
struct wxEventProcessingData
|
||||
{
|
||||
wxEventProcessingData(const FILE_NOTIFY_INFORMATION* ne,
|
||||
|
||||
@@ -1058,7 +1058,7 @@
|
||||
// Default is 1.
|
||||
//
|
||||
// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it
|
||||
// it used by wxComboBox
|
||||
// is used by wxComboBox
|
||||
#define wxUSE_COMBOCTRL 1
|
||||
|
||||
// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox
|
||||
|
||||
@@ -165,7 +165,7 @@ enum POPUPCHECKSTATES
|
||||
// If we declare them as taking LOGFONT below, the code would be able to
|
||||
// silently pass LOGFONTA to them in ANSI build and would crash at run-time
|
||||
// under Windows Vista/7 because of a buffer overrun (LOGFONTA being smaller
|
||||
// than LOGFONTW expected by these functions). If we we declare them as taking
|
||||
// than LOGFONTW expected by these functions). If we declare them as taking
|
||||
// LOGFONTW, the code wouldn't work correctly under XP. So we use a special
|
||||
// wxUxThemeFont class to encapsulate this and intentionally change the LOGFONT
|
||||
// output parameters of the theme functions to take it instead.
|
||||
|
||||
@@ -57,7 +57,7 @@ public:
|
||||
// watches from kqeueue and from FSEvents
|
||||
bool RemoveAll() wxOVERRIDE;
|
||||
|
||||
// post an file change event to the owner
|
||||
// post a file change event to the owner
|
||||
void PostChange(const wxFileName& oldFileName,
|
||||
const wxFileName& newFileName, int event);
|
||||
|
||||
|
||||
@@ -1064,7 +1064,7 @@
|
||||
// Default is 1.
|
||||
//
|
||||
// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it
|
||||
// it used by wxComboBox
|
||||
// is used by wxComboBox
|
||||
#define wxUSE_COMBOCTRL 1
|
||||
|
||||
// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox
|
||||
|
||||
@@ -33,7 +33,7 @@ public:
|
||||
// A container of font and colours with inheritance support. It holds two
|
||||
// sets of attributes:
|
||||
// 1. The currently specified ones from parsed tags that contain
|
||||
// information on on what should change in the output; some of them
|
||||
// information on what should change in the output; some of them
|
||||
// may be invalid if only the others are affected by a change.
|
||||
// 2. The _effective_ attributes that are always valid and accumulate
|
||||
// all past changes as the markup is being parser; these are used
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#endif
|
||||
|
||||
// wxRescaleCoord is used to scale the components of the given wxSize by the
|
||||
// ratio between 2 scales, with rounding. It doesn't not scale the components
|
||||
// ratio between 2 scales, with rounding. It doesn't scale the components
|
||||
// if they're set to -1 (wxDefaultCoord), as this value is special in wxSize.
|
||||
//
|
||||
// The way it's used is special because we want to ensure there is no confusion
|
||||
|
||||
@@ -181,7 +181,7 @@ public:
|
||||
bool LoadArg(wxPrintfArg *p, va_list &argptr);
|
||||
|
||||
private:
|
||||
// An helper function of LoadArg() which is used to handle the '*' flag
|
||||
// A helper function of LoadArg() which is used to handle the '*' flag
|
||||
void ReplaceAsteriskWith(int w);
|
||||
};
|
||||
|
||||
|
||||
@@ -207,7 +207,7 @@ public:
|
||||
return InsertPage(-1, label, bmp, pageObj);
|
||||
}
|
||||
|
||||
// Deletes all all properties and all pages.
|
||||
// Deletes all properties and all pages.
|
||||
virtual void Clear() wxOVERRIDE;
|
||||
|
||||
// Deletes all properties on given page.
|
||||
|
||||
@@ -324,7 +324,7 @@ public:
|
||||
const wxPGAttributeStorage& GetPropertyAttributes( wxPGPropArg id ) const
|
||||
{
|
||||
// If 'id' refers to invalid property, then we will return dummy
|
||||
// attributes (i.e. root property's attributes, which contents should
|
||||
// attributes (i.e. root property's attributes, which contents
|
||||
// should always be empty and of no consequence).
|
||||
wxPG_PROP_ARG_CALL_PROLOG_RETVAL(m_pState->DoGetRoot()->GetAttributes())
|
||||
return p->GetAttributes();
|
||||
|
||||
@@ -463,7 +463,7 @@ private:
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
// wxEnumProperty with wxString value and writable combo box editor.
|
||||
// Uses int value, similar to wxEnumProperty, unless text entered by user is
|
||||
// Uses int value, similar to wxEnumProperty, unless text entered by user
|
||||
// is not in choices (in which case string value is used).
|
||||
class WXDLLIMPEXP_PROPGRID wxEditEnumProperty : public wxEnumProperty
|
||||
{
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@
|
||||
// bother to inline them unless we crank the optimization levels way up.
|
||||
// Therefore, we also provide macros to wring maximum speed out of compiler
|
||||
// unconditionally (e.g. even in debug builds). Of course, if the performance
|
||||
// isn't absolutely crucial for you you shouldn't be using them but the inline
|
||||
// isn't absolutely crucial for you shouldn't be using them but the inline
|
||||
// functions instead.
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -1054,7 +1054,7 @@
|
||||
// Default is 1.
|
||||
//
|
||||
// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it
|
||||
// it used by wxComboBox
|
||||
// is used by wxComboBox
|
||||
#define wxUSE_COMBOCTRL 1
|
||||
|
||||
// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox
|
||||
|
||||
@@ -65,7 +65,7 @@ enum wxStockHelpStringClient
|
||||
wxSTOCK_MENU // help string to use for menu items
|
||||
};
|
||||
|
||||
// Returns an help string for the given stock UI element and for the given "context".
|
||||
// Returns a help string for the given stock UI element and for the given "context".
|
||||
WXDLLIMPEXP_CORE wxString wxGetStockHelpString(wxWindowID id,
|
||||
wxStockHelpStringClient client = wxSTOCK_MENU);
|
||||
|
||||
|
||||
@@ -143,7 +143,7 @@ public:
|
||||
|
||||
// return true if the converter's charset is UTF-8, i.e. char* strings
|
||||
// decoded using this object can be directly copied to wxString's internal
|
||||
// storage without converting to WC and than back to UTF-8 MB string
|
||||
// storage without converting to WC and then back to UTF-8 MB string
|
||||
virtual bool IsUTF8() const { return false; }
|
||||
|
||||
// The old conversion functions. The existing classes currently mostly
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user