AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

No changes whatsoever, just remove trailing whitespace.

Browse Source 
There are no real changes in this commit but it removes all trailing white
space from our source files. This avoids problems when applying patches and
making diffs and it would be nice to prevent it from reappearing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2010-09-30 11:44:45 +00:00
parent 6255fac96f
commit ce00f59b5b
155 changed files with 708 additions and 708 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/bombs/bombs1.cpp
View File

@ -131,7 +131,7 @@ void BombsCanvas::DrawField(wxDC *dc, int xc1, int yc1, int xc2, int yc2)
dc->SetBrush(*focusedBrush);
else if (m_game->IsSelected(x,y))
dc->SetBrush(*wxWHITE_BRUSH);
else
else
dc->SetBrush(*yellowBrush);
dc->DrawRectangle( x*m_cellWidth*X_UNIT, y*m_cellHeight*Y_UNIT,
m_cellWidth*X_UNIT+1, m_cellHeight*Y_UNIT+1);
@ -163,7 +163,7 @@ void BombsCanvas::DrawField(wxDC *dc, int xc1, int yc1, int xc2, int yc2)
wxString msg;
msg.Printf(wxT("%d bombs, %u marked, %d remaining cells"),
m_game->GetNumBombs(), m_game->GetNumMarkedCells(),
m_game->GetNumBombs(), m_game->GetNumMarkedCells(),
m_game->GetNumRemainingCells() );
#if wxUSE_LOG && wxUSE_STATUSBAR

2
include/wx/button.h
View File

@ -110,7 +110,7 @@ public:
void SetBitmapMargins(wxCoord x, wxCoord y) { DoSetBitmapMargins(x, y); }
void SetBitmapMargins(const wxSize& sz) { DoSetBitmapMargins(sz.x, sz.y); }
wxSize GetBitmapMargins() { return DoGetBitmapMargins(); }
// set the image position relative to the text, i.e. wxLEFT means that the
// image is to the left of the text (this is the default)
void SetBitmapPosition(wxDirection dir);

6
include/wx/dataview.h
View File

@ -125,7 +125,7 @@ public:
virtual bool ItemsChanged( const wxDataViewItemArray &items );
virtual bool ValueChanged( const wxDataViewItem &item, unsigned int col ) = 0;
virtual bool Cleared() = 0;
// some platforms, such as GTK+, may need a two step procedure for ::Reset()
virtual bool BeforeReset() { return true; }
virtual bool AfterReset() { return Cleared(); }
@ -305,7 +305,7 @@ public:
// helper methods provided by list models only
virtual unsigned GetRow( const wxDataViewItem &item ) const = 0;
// returns the number of rows
// returns the number of rows
virtual unsigned int GetCount() const = 0;
// implement some base class pure virtual directly
@ -1151,7 +1151,7 @@ public:
wxDataViewItem GetNthChild( const wxDataViewItem& parent, unsigned int pos ) const;
int GetChildCount( const wxDataViewItem& parent ) const;
void SetItemText( const wxDataViewItem& item, const wxString &text );
wxString GetItemText( const wxDataViewItem& item ) const;
void SetItemIcon( const wxDataViewItem& item, const wxIcon &icon );

6
include/wx/dir.h
View File

@ -105,7 +105,7 @@ public:
// get the full name of the directory (without '/' at the end)
wxString GetName() const;
// file enumeration routines
// -------------------------
@ -155,7 +155,7 @@ public:
// static utilities for directory management
// (alias to wxFileName's functions for dirs)
// -----------------------------------------
// test for existence of a directory with the given name
static bool Exists(const wxString& dir);
@ -163,7 +163,7 @@ public:
int flags = 0);
static bool Remove(const wxString &dir, int flags = 0);
private:
friend class wxDirData;

4
include/wx/dvrenderers.h
View File

@ -351,10 +351,10 @@ public:
wxDataViewChoiceByIndexRenderer( const wxArrayString &choices,
wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
int alignment = wxDVR_DEFAULT_ALIGNMENT );
virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value );
virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value );
virtual bool SetValue( const wxVariant &value );
virtual bool GetValue( wxVariant &value ) const;
};

2
include/wx/generic/dataview.h
View File

@ -79,7 +79,7 @@ public:
private:
// common part of all ctors
void Init(int width, wxAlignment align, int flags);
void UpdateDisplay();
wxString m_title;

2
include/wx/glcanvas.h
View File

@ -229,7 +229,7 @@ public:
wxGLAPI();
~wxGLAPI();
static void glFrustum(GLfloat left, GLfloat right, GLfloat bottom,
static void glFrustum(GLfloat left, GLfloat right, GLfloat bottom,
GLfloat top, GLfloat zNear, GLfloat zFar);
static void glBegin(GLenum mode);
static void glTexCoord2f(GLfloat s, GLfloat t);

4
include/wx/gtk/dvrenderers.h
View File

@ -286,10 +286,10 @@ public:
wxDataViewChoiceByIndexRenderer( const wxArrayString &choices,
wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
int alignment = wxDVR_DEFAULT_ALIGNMENT );
virtual bool SetValue( const wxVariant &value );
virtual bool GetValue( wxVariant &value ) const;
private:
virtual void GtkOnTextEdited(const gchar *itempath, const wxString& str);
};

30
include/wx/gtk/private/string.h
View File

@ -48,10 +48,10 @@ public:
m_label = label;
m_key = key;
}
~wxGtkCollatableString()
{
if (m_key)
if (m_key)
g_free( m_key );
}
@ -63,22 +63,22 @@ class wxGtkCollatedArrayString
{
public:
wxGtkCollatedArrayString() { }
int Add( const wxString &new_label )
{
int index = 0;
gchar *new_key_lower = g_utf8_casefold( new_label.utf8_str(), -1);
gchar *new_key = g_utf8_collate_key( new_key_lower, -1);
gchar *new_key_lower = g_utf8_casefold( new_label.utf8_str(), -1);
gchar *new_key = g_utf8_collate_key( new_key_lower, -1);
g_free( new_key_lower );
wxSharedPtr<wxGtkCollatableString> new_ptr( new wxGtkCollatableString( new_label, new_key ) );
wxVector< wxSharedPtr<wxGtkCollatableString> >::iterator iter;
for (iter = m_list.begin(); iter != m_list.end(); ++iter)
{
wxSharedPtr<wxGtkCollatableString> ptr = *iter;
gchar *key = ptr->m_key;
if (strcmp(key,new_key) >= 0)
{
@ -87,31 +87,31 @@ public:
}
index ++;
}
m_list.push_back( new_ptr );
return index;
}
size_t GetCount()
{
return m_list.size();
}
wxString At( size_t index )
{
return m_list[index]->m_label;
}
void Clear()
{
m_list.clear();
}
void RemoveAt( size_t index )
{
m_list.erase( m_list.begin() + index );
}
private:
wxVector< wxSharedPtr<wxGtkCollatableString> > m_list;
};

2
include/wx/gtk/slider.h
View File

@ -63,7 +63,7 @@ public:
void GTKDisableEvents();
void GTKEnableEvents();
bool GTKEventsDisabled() const;
double m_pos;
int m_scrollEventType;
bool m_needThumbRelease;

4
include/wx/gtk/window.h
View File

@ -242,10 +242,10 @@ public:
// see the docs in src/gtk/window.cpp
GtkWidget *m_widget; // mostly the widget seen by the rest of GTK
GtkWidget *m_wxwindow; // mostly the client area as per wxWidgets
// label for use with GetLabelSetLabel
wxString m_gtkLabel;
// return true if the window is of a standard (i.e. not wxWidgets') class
bool IsOfStandardClass() const { return m_wxwindow == NULL; }

4
include/wx/object.h
View File

@ -131,7 +131,7 @@ public:
}
wxDECLARE_CLASS_INFO_ITERATORS();
private:
const wxChar *m_className;
int m_objectSize;
@ -233,7 +233,7 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name);
#define wxIMPLEMENT_CLASS(name, basename) \
wxIMPLEMENT_ABSTRACT_CLASS(name, basename)
#define wxIMPLEMENT_CLASS2(name, basename1, basename2) \
IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2)

2
include/wx/osx/bmpbuttn.h
View File

@ -40,7 +40,7 @@ public:
const wxString& name = wxButtonNameStr);
protected:
virtual wxSize DoGetBestSize() const;
DECLARE_DYNAMIC_CLASS(wxBitmapButton)

8
include/wx/osx/button.h
View File

@ -56,7 +56,7 @@ protected:
void OnEnterWindow( wxMouseEvent& event);
void OnLeaveWindow( wxMouseEvent& event);
virtual wxBitmap DoGetBitmap(State which) const;
virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
virtual void DoSetBitmapPosition(wxDirection dir);
@ -67,7 +67,7 @@ protected:
m_marginY = y;
InvalidateBestSize();
}
// the margins around the bitmap
int m_marginX;
int m_marginY;
@ -75,8 +75,8 @@ protected:
// the bitmaps for the different state of the buttons, all of them may be
// invalid and the button only shows a bitmap at all if State_Normal bitmap
// is valid
wxBitmap m_bitmaps[State_Max];
wxBitmap m_bitmaps[State_Max];
DECLARE_DYNAMIC_CLASS(wxButton)
DECLARE_EVENT_TABLE()
};

2
include/wx/osx/carbon/evtloop.h
View File

@ -24,7 +24,7 @@ protected:
virtual int DoDispatchTimeout(unsigned long timeout);
virtual void DoRun();
virtual void DoStop();
virtual CFRunLoopRef CFGetCurrentRunLoop() const;

2
include/wx/osx/carbon/private.h
View File

@ -1044,7 +1044,7 @@ public :
virtual bool IsFullScreen() const;
virtual bool ShowFullScreen(bool show, long style);
virtual void ShowWithoutActivating();
virtual void RequestUserAttention(int flags);

2
include/wx/osx/carbon/private/print.h
View File

@ -47,7 +47,7 @@ protected :
virtual void TransferPaperInfoTo( wxPrintData &data );
virtual void TransferResolutionTo( wxPrintData &data );
virtual void UpdateFromPMState();
virtual void UpdateToPMState();

2
include/wx/osx/cocoa/dataview.h
View File

@ -281,7 +281,7 @@ private:
ofItem:(id)item;
-(id)
outlineView:(NSOutlineView*)outlineView
outlineView:(NSOutlineView*)outlineView
objectValueForTableColumn:(NSTableColumn*)tableColumn
byItem:(id)item;

6
include/wx/osx/cocoa/evtloop.h
View File

@ -15,14 +15,14 @@ class WXDLLIMPEXP_BASE wxGUIEventLoop : public wxCFEventLoop
{
public:
wxGUIEventLoop();
protected:
virtual int DoDispatchTimeout(unsigned long timeout);
virtual void DoRun();
virtual void DoStop();
virtual CFRunLoopRef CFGetCurrentRunLoop() const;
};

4
include/wx/osx/cocoa/private.h
View File

@ -181,7 +181,7 @@ public :
virtual void controlAction(WXWidget slf, void* _cmd, void* sender);
virtual void controlDoubleAction(WXWidget slf, void* _cmd, void *sender);
// for wxTextCtrl-derived classes, put here since they don't all derive
// from the same pimpl class.
virtual void controlTextDidChange();
@ -259,7 +259,7 @@ public :
virtual void WindowToScreen( int *x, int *y );
virtual bool IsActive();
virtual void SetModified(bool modified);
virtual bool IsModified() const;

20
include/wx/osx/cocoa/private/textimpl.h
View File

@ -69,14 +69,14 @@ public:
virtual void SetSelection( long from , long to );
virtual void WriteText(const wxString& str) ;
virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
virtual bool GetStyle(long position, wxTextAttr& style);
virtual void SetStyle(long start, long end, const wxTextAttr& style);
virtual bool CanFocus() const;
virtual bool HasOwnContextMenu() const { return true; }
virtual void CheckSpelling(bool check);
virtual wxSize GetBestSize() const;
@ -90,19 +90,19 @@ class wxNSComboBoxControl : public wxNSTextFieldControl, public wxComboWidgetImp
public :
wxNSComboBoxControl( wxComboBox *wxPeer, WXWidget w );
virtual ~wxNSComboBoxControl();
virtual int GetSelectedItem() const;
virtual void SetSelectedItem(int item);
virtual int GetNumberOfItems() const;
virtual void InsertItem(int pos, const wxString& item);
virtual void RemoveItem(int pos);
virtual void Clear();
virtual wxString GetStringAtIndex(int pos) const;
virtual int FindString(const wxString& text) const;
private:
NSComboBox* m_comboBox;

2
include/wx/osx/combobox.h
View File

@ -100,7 +100,7 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase
virtual void SetString(unsigned int n, const wxString& s);
virtual unsigned int GetCount() const;
// these methods are provided by wxTextEntry for the native impl.
#if wxOSX_USE_CARBON
// Text field functions

52
include/wx/osx/core/private.h
View File

@ -270,7 +270,7 @@ public :
virtual void SetScrollThumb( wxInt32 value, wxInt32 thumbSize ) = 0;
virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true ) = 0;
virtual void SetToolTip(wxToolTip* WXUNUSED(tooltip)) { }
// is the clicked event sent AFTER the state already changed, so no additional
@ -278,7 +278,7 @@ public :
virtual bool ButtonClickDidStateChange() = 0;
virtual void InstallEventHandler( WXWidget control = NULL ) = 0;
// Mechanism used to keep track of whether a change should send an event
// Do SendEvents(false) when starting actions that would trigger programmatic events
// and SendEvents(true) at the end of the block.
@ -481,13 +481,13 @@ public :
long extraStyle);
#if wxOSX_USE_COCOA
static wxWidgetImplType* CreateComboBox( wxComboBox* wxpeer,
wxWindowMac* parent,
wxWindowID id,
static wxWidgetImplType* CreateComboBox( wxComboBox* wxpeer,
wxWindowMac* parent,
wxWindowID id,
wxMenu* menu,
const wxPoint& pos,
const wxPoint& pos,
const wxSize& size,
long style,
long style,
long extraStyle);
#endif
@ -564,7 +564,7 @@ public:
// accessing content
virtual unsigned int ListGetCount() const = 0;
virtual int DoListHitTest( const wxPoint& inpoint ) const = 0;
};
@ -628,7 +628,7 @@ public :
virtual int GetLineLength(long lineNo) const ;
virtual wxString GetLineText(long lineNo) const ;
virtual void CheckSpelling(bool WXUNUSED(check)) { }
virtual wxSize GetBestSize() const { return wxDefaultSize; }
private:
@ -645,20 +645,20 @@ public :
wxComboWidgetImpl() {}
virtual ~wxComboWidgetImpl() {}
virtual int GetSelectedItem() const { return -1; };
virtual void SetSelectedItem(int WXUNUSED(item)) {};
virtual int GetNumberOfItems() const { return -1; };
virtual void InsertItem(int WXUNUSED(pos), const wxString& WXUNUSED(item)) {}
virtual void RemoveItem(int WXUNUSED(pos)) {}
virtual void Clear() {}
virtual wxString GetStringAtIndex(int WXUNUSED(pos)) const { return wxEmptyString; }
virtual int FindString(const wxString& WXUNUSED(text)) const { return -1; }
};
@ -671,7 +671,7 @@ class wxButtonImpl
public :
wxButtonImpl(){}
virtual ~wxButtonImpl(){}
virtual void SetPressedBitmap( const wxBitmap& bitmap ) = 0;
} ;
@ -759,11 +759,11 @@ public :
virtual void SetExtraStyle( long WXUNUSED(exStyle) )
{
}
virtual void SetWindowStyleFlag( long WXUNUSED(style) )
{
}
virtual bool SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style))
{
return false ;
@ -797,7 +797,7 @@ public :
virtual bool IsFullScreen() const= 0;
virtual void ShowWithoutActivating() { Show(true); }
virtual bool ShowFullScreen(bool show, long style)= 0;
virtual void RequestUserAttention(int flags) = 0;
@ -807,23 +807,23 @@ public :
virtual void WindowToScreen( int *x, int *y ) = 0;
virtual bool IsActive() = 0;
wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; }
static wxNonOwnedWindowImpl*
FindFromWXWindow(WXWindow window);
static void RemoveAssociations( wxNonOwnedWindowImpl* impl);
static void Associate( WXWindow window, wxNonOwnedWindowImpl *impl );
// static creation methods, must be implemented by all toolkits
static wxNonOwnedWindowImpl* CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, WXWindow native) ;
static wxNonOwnedWindowImpl* CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, const wxPoint& pos, const wxSize& size,
long style, long extraStyle, const wxString& name ) ;
virtual void SetModified(bool WXUNUSED(modified)) { }
virtual bool IsModified() const { return false; }

10
include/wx/osx/dialog.h
View File

@ -56,12 +56,12 @@ public:
// show the dialog modally and return the value passed to EndModal()
virtual int ShowModal();
virtual void ShowWindowModal();
// may be called to terminate the dialog with the given return code
virtual void EndModal(int retCode);
static bool OSXHasModalDialogsOpen();
static void OSXBeginModalDialog();
static void OSXEndModalDialog();
@ -70,13 +70,13 @@ public:
// --------------
wxDialogModality GetModality() const;
#if wxOSX_USE_COCOA
virtual void ModalFinishedCallback(void* WXUNUSED(panel), int WXUNUSED(returnCode)) {}
#endif
protected:
// show window modal dialog
// show window modal dialog
void DoShowWindowModal();
// end window modal dialog.
@ -87,7 +87,7 @@ protected:
wxDialogModality m_modality;
wxModalEventLoop* m_eventLoop;
private:

4
include/wx/osx/dirdlg.h
View File

@ -24,11 +24,11 @@ public:
const wxString& name = wxDirDialogNameStr);
virtual int ShowModal();
#if wxOSX_USE_COCOA
virtual void ShowWindowModal();
virtual void ModalFinishedCallback(void* panel, int returnCode);
#endif
#endif
protected:

26
include/wx/osx/evtloop.h
View File

@ -26,17 +26,17 @@ public:
// enters a loop calling OnNextIteration(), Pending() and Dispatch() and
// terminating when Exit() is called
virtual int Run();
// sets the "should exit" flag and wakes up the loop so that it terminates
// soon
virtual void Exit(int rc = 0);
// return true if any events are available
virtual bool Pending() const;
// dispatch a single event, return false if we should exit from the loop
virtual bool Dispatch();
// same as Dispatch() but doesn't wait for longer than the specified (in
// ms) timeout, return true if an event was processed, false if we should
// exit the loop or -1 if timeout expired
@ -45,7 +45,7 @@ public:
// implement this to wake up the loop: usually done by posting a dummy event
// to it (can be called from non main thread)
virtual void WakeUp();
virtual bool YieldFor(long eventsToProcess);
#if wxUSE_EVENTLOOP_SOURCE
@ -60,23 +60,23 @@ protected:
virtual CFRunLoopRef CFGetCurrentRunLoop() const;
virtual int DoDispatchTimeout(unsigned long timeout);
virtual void DoRun();
virtual void DoStop();
// should we exit the loop?
bool m_shouldExit;
// the loop exit code
int m_exitcode;
// cfrunloop
CFRunLoopRef m_runLoop;
// runloop observer
CFRunLoopObserverRef m_runLoopObserver;
private:
// process all already pending events and dispatch a new one (blocking
// until it appears in the event queue if necessary)
@ -101,12 +101,12 @@ class WXDLLIMPEXP_CORE wxModalEventLoop : public wxGUIEventLoop
public:
wxModalEventLoop(wxWindow *modalWindow);
wxModalEventLoop(WXWindow modalNativeWindow);
protected:
virtual void DoRun();
virtual void DoStop();
// (in case) the modal window for this event loop
wxNonOwnedWindow* m_modalWindow;
WXWindow m_modalNativeWindow;

6
include/wx/osx/filedlg.h
View File

@ -38,20 +38,20 @@ public:
virtual void GetFilenames(wxArrayString& files) const { files = m_fileNames ; }
virtual int ShowModal();
#if wxOSX_USE_COCOA
virtual void ShowWindowModal();
virtual void ModalFinishedCallback(void* panel, int resultCode);
#endif
virtual bool SupportsExtraControl() const;
protected:
// not supported for file dialog, RR
virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
int WXUNUSED(width), int WXUNUSED(height),
int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {}
void SetupExtraControls(WXWindow nativeWindow);
};

2
include/wx/osx/font.h
View File

@ -36,7 +36,7 @@ class WXDLLIMPEXP_CORE wxFont : public wxFontBase
public:
// ctors and such
wxFont() { }
wxFont( wxOSXSystemFont systemFont );
#if wxOSX_USE_COCOA

2
include/wx/osx/iphone/chkconf.h
View File

@ -94,7 +94,7 @@
#endif
#ifndef __WXUNIVERSAL__
#undef wxUSE_SCROLLBAR
#undef wxUSE_SCROLLBAR
#define wxUSE_SCROLLBAR 0
#endif

2
include/wx/osx/iphone/private.h
View File

@ -173,7 +173,7 @@ public :
// FIXME: Does iPhone have a concept of inactive windows?
virtual bool IsActive() { return true; }
wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; }
virtual bool InitialShowEventSent() { return m_initialShowSent; }

20
include/wx/osx/iphone/private/textimpl.h
View File

@ -59,14 +59,14 @@ public:
virtual void SetSelection( long from , long to );
virtual void WriteText(const wxString& str) ;
virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
virtual bool GetStyle(long position, wxTextAttr& style);
virtual void SetStyle(long start, long end, const wxTextAttr& style);
virtual bool CanFocus() const;
virtual bool HasOwnContextMenu() const { return true; }
virtual void CheckSpelling(bool check);
virtual wxSize GetBestSize() const;
@ -80,19 +80,19 @@ class wxNSComboBoxControl : public wxUITextFieldControl, public wxComboWidgetImp
public :
wxNSComboBoxControl( wxWindow *wxPeer, WXWidget w );
virtual ~wxNSComboBoxControl();
virtual int GetSelectedItem() const;
virtual void SetSelectedItem(int item);
virtual int GetNumberOfItems() const;
virtual void InsertItem(int pos, const wxString& item);
virtual void RemoveItem(int pos);
virtual void Clear();
virtual wxString GetStringAtIndex(int pos) const;
virtual int FindString(const wxString& text) const;
private:
NSComboBox* m_comboBox;

2
include/wx/osx/msgdlg.h
View File

@ -23,7 +23,7 @@ public:
const wxPoint& pos = wxDefaultPosition);
virtual int ShowModal();
#if wxOSX_USE_COCOA
virtual void ShowWindowModal();
virtual void ModalFinishedCallback(void* panel, int resultCode);

12
include/wx/osx/nonownedwnd.h
View File

@ -56,9 +56,9 @@ public:
const wxString& name = wxPanelNameStr);
bool Create(wxWindow *parent, WXWindow nativeWindow);
virtual ~wxNonOwnedWindow();
virtual void SubclassWin(WXWindow nativeWindow);
virtual void UnsubclassWin();
@ -109,9 +109,9 @@ public:
virtual void HandleResized( double timestampsec );
virtual void HandleMoved( double timestampsec );
virtual void HandleResizing( double timestampsec, wxRect* rect );
virtual bool Destroy();
protected:
// common part of all ctors
void Init();
@ -124,7 +124,7 @@ protected:
virtual bool OSXShowWithEffect(bool show,
wxShowEffect effect,
unsigned timeout);
virtual void WillBeDestroyed();
wxNonOwnedWindowImpl* m_nowpeer ;
@ -132,7 +132,7 @@ protected:
// wxWindowMac* m_macFocus ;
static wxNonOwnedWindow *s_macDeactivateWindow;
private :
wxRegion m_shape;
};

2
include/wx/osx/popupwin.h
View File

@ -26,7 +26,7 @@ public:
{ (void)Create(parent, flags); }
bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
virtual bool Show(bool show);
protected:

2
include/wx/osx/private/glgrab.h
View File

@ -4,7 +4,7 @@
extern "C" {
#endif
CGImageRef grabViaOpenGL(CGDirectDisplayID display,
CGImageRef grabViaOpenGL(CGDirectDisplayID display,
CGRect srcRect);
#if defined __cplusplus

16
include/wx/osx/sound.h
View File

@ -24,7 +24,7 @@ class WXDLLIMPEXP_ADV wxSoundData
public :
wxSoundData();
virtual ~wxSoundData();
virtual bool Play(unsigned int flags) = 0;
// stops the sound and deletes the optional timer
virtual void Stop();
@ -33,12 +33,12 @@ public :
// mark this to be deleted
virtual void MarkForDeletion();
virtual bool IsMarkedForDeletion() const { return m_markedForDeletion; }
// does the true work of stopping and cleaning up
virtual void DoStop() = 0;
protected :
void CreateAndStartTimer();
unsigned int m_flags;
wxSoundTimer* m_pTimer;
bool m_markedForDeletion;
@ -58,16 +58,16 @@ public:
bool Create(int size, const wxByte* data);
bool IsOk() const { return m_data != NULL; }
// Stop playing any sound
static void Stop();
// Returns true if a sound is being played
static bool IsPlaying();
// Notification when a sound has stopped
static void SoundStopped(const wxSoundData* data);
protected:
bool DoPlay(unsigned flags) const;
void Init();
@ -75,7 +75,7 @@ protected:
private:
// data of this object
class wxSoundData *m_data;
wxDECLARE_NO_COPY_CLASS(wxSound);
};

2
include/wx/osx/textctrl.h
View File

@ -99,7 +99,7 @@ public:
virtual void Copy();
virtual void Cut();
virtual void Paste();
// Implementation
// --------------
virtual void Command(wxCommandEvent& event);

6
include/wx/osx/textentry.h
View File

@ -32,11 +32,11 @@ class WXDLLIMPEXP_CORE wxTextEntry: public wxTextEntryBase
{
public:
wxTextEntry()
wxTextEntry()
: m_editable(true),
m_maxLength(0)
{ }
virtual ~wxTextEntry() {};
virtual bool IsEditable() const;
@ -91,7 +91,7 @@ public:
protected:
virtual wxString DoGetValue() const;
bool m_editable;
// need to make this public because of the current implementation via callbacks

6
include/wx/osx/toolbar.h
View File

@ -44,7 +44,7 @@ class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
const wxString& name = wxToolBarNameStr);
virtual void SetWindowStyleFlag(long style);
virtual bool Destroy();
// override/implement base class virtuals
@ -72,7 +72,7 @@ class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
void OnMouse(wxMouseEvent& event) ;
virtual void MacSuperChangedPosition() ;
#endif
#if wxOSX_USE_NATIVE_TOOLBAR
bool MacInstallNativeToolbar(bool usesNative);
void MacUninstallNativeToolbar();
@ -111,7 +111,7 @@ protected:
void* m_macToolbar ;
#endif
#ifdef __WXOSX_IPHONE__
WX_UIView m_macToolbar;
WX_UIView m_macToolbar;
#endif
};

6
include/wx/osx/toplevel.h
View File

@ -44,9 +44,9 @@ public:
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr);
bool Create(wxWindow *parent, WXWindow nativeWindow);
virtual bool Destroy();
virtual wxPoint GetClientAreaOrigin() const;
@ -64,7 +64,7 @@ public:
virtual void Iconize(bool iconize = true);
virtual bool IsIconized() const;
virtual void Restore();
virtual bool IsActive();
virtual void ShowWithoutActivating();

4
include/wx/osx/window.h
View File

@ -265,7 +265,7 @@ public:
virtual bool OSXHandleClicked( double timestampsec );
virtual bool OSXHandleKeyEvent( wxKeyEvent& event );
bool IsNativeWindowWrapper() const { return m_isNativeWindowWrapper; }
protected:
// For controls like radio buttons which are genuinely composite
@ -301,7 +301,7 @@ protected:
bool m_vScrollBarAlwaysShown;
wxWindow* m_growBox ;
wxString m_label ;
bool m_isNativeWindowWrapper;
// set to true if we do a sharp clip at the content area of this window

2
include/wx/propgrid/property.h
View File

@ -1917,7 +1917,7 @@ public:
modifying the value of the editor control (usually by clearing
it). Currently, this can work with following properties:
wxIntProperty, wxUIntProperty, wxFloatProperty, wxEditEnumProperty.
@param enable
Whether to enable or disable this behavior (it is disabled by
default).

4
include/wx/propgrid/propgrid.h
View File

@ -397,7 +397,7 @@ wxPG_VFB_BEEP = 0x02,
wxPG_VFB_MARK_CELL = 0x04,
/**
Display a text message explaining the situation.
Display a text message explaining the situation.
To customize the way the message is displayed, you need to
reimplement wxPropertyGrid::DoShowPropertyError() in a
@ -802,7 +802,7 @@ public:
/**
Centers the splitter.
@param enableAutoResizing
If @true, automatic column resizing is enabled (only applicapple
if window style wxPG_SPLITTER_AUTO_CENTER is used).

2
include/wx/ribbon/art.h
View File

@ -629,7 +629,7 @@ protected:
wxColour m_button_bar_active_background_top_colour;
wxColour m_button_bar_active_background_top_gradient_colour;
wxColour m_gallery_button_background_colour;
wxColour m_gallery_button_background_gradient_colour;
wxColour m_gallery_button_background_gradient_colour;
wxColour m_gallery_button_hover_background_colour;
wxColour m_gallery_button_hover_background_gradient_colour;
wxColour m_gallery_button_active_background_colour;

2
include/wx/ribbon/buttonbar.h
View File

@ -66,7 +66,7 @@ public:
const wxString& label,
const wxBitmap& bitmap,
const wxString& help_string = wxEmptyString);
virtual wxRibbonButtonBarButtonBase* AddButton(
int button_id,
const wxString& label,

2
include/wx/ribbon/panel.h
View File

@ -23,7 +23,7 @@ enum wxRibbonPanelOption
wxRIBBON_PANEL_NO_AUTO_MINIMISE = 1 << 0,
wxRIBBON_PANEL_EXT_BUTTON = 1 << 3,
wxRIBBON_PANEL_MINIMISE_BUTTON = 1 << 4,
wxRIBBON_PANEL_DEFAULT_STYLE = 0,
};

12
include/wx/richtext/richtextbuffer.h
View File

@ -256,19 +256,19 @@ class WXDLLIMPEXP_RICHTEXT wxRichTextAnchoredObjectAttr
public:
wxRichTextAnchoredObjectAttr() { Init(); }
wxRichTextAnchoredObjectAttr(const wxRichTextAnchoredObjectAttr& attr) { Copy(attr); }
void Init();
void operator= (const wxRichTextAnchoredObjectAttr& attr) { Copy(attr); }
void Copy(const wxRichTextAnchoredObjectAttr& attr);
/// Is this anchored? TODO: difference between anchored and floating?
bool IsAnchored() const { return m_floating != wxRICHTEXT_FLOAT_NONE; }
/// Is this floating?
bool IsFloating() const { return m_floating != wxRICHTEXT_FLOAT_NONE; }
void SetFloatingMode(int floating) { m_floating = floating; }
int GetAlignment() const { return m_align; }
void SetAlignment(int align) { m_align = align; }
@ -467,7 +467,7 @@ public:
/// Dump to output stream for debugging
virtual void Dump(wxTextOutputStream& stream);
/// Can we edit properties via a GUI?
virtual bool CanEditProperties() const { return false; }
@ -918,7 +918,7 @@ public:
/// Invalidate the buffer. With no argument, invalidates whole buffer.
void Invalidate(const wxRichTextRange& invalidRange = wxRICHTEXT_ALL);
/// Gather information about floating objects. If untilObj is non-NULL,
/// will stop getting information if the current object is this, since we
/// will collect the rest later.
@ -1264,7 +1264,7 @@ public:
// Make an image block from the wxImage in the given
// format.
virtual bool MakeImageBlock(wxImage& image, wxBitmapType imageType, int quality = 80);
// Uses a const wxImage for efficiency, but can't set quality (only relevant for JPEG)
virtual bool MakeImageBlockDefaultQuality(const wxImage& image, wxBitmapType imageType);

8
include/wx/richtext/richtextimagedlg.h
View File

@ -1,10 +1,10 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/richtext/richtextimagedlg.h
// Purpose:
// Purpose:
// Author: Mingquan Yang
// Modified by:
// Modified by:
// Created: Wed 02 Jun 2010 11:27:23 CST
// RCS-ID:
// RCS-ID:
// Copyright: (c) Mingquan Yang
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -45,7 +45,7 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
*/
class WXDLLIMPEXP_RICHTEXT wxRichTextImageDialog: public wxDialog
{
{
DECLARE_DYNAMIC_CLASS( wxRichTextImageDialog )
DECLARE_EVENT_TABLE()

4
include/wx/stattext.h
View File

@ -80,12 +80,12 @@ protected: // functions required for wxST_ELLIPSIZE_* support
// choose the default border for this window
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
// calls only RemoveMarkup() on the original label
// calls only RemoveMarkup() on the original label
// if the wxST_MARKUP style is set
// (but unlike GetLabelText won't remove mnemonics)
virtual wxString GetLabelWithoutMarkup() const;
// just calls RemoveMarkup() & Ellipsize() on the original label
// just calls RemoveMarkup() & Ellipsize() on the original label
// if the wxST_MARKUP & wxST_ELLIPSIZE_* styles are set
// (but unlike GetLabelText won't remove mnemonics)
virtual wxString GetEllipsizedLabelWithoutMarkup() const;

8
include/wx/toplevel.h
View File

@ -200,10 +200,10 @@ public:
// maximize the window to cover entire screen
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) = 0;
// shows the window, but doesn't activate it. If the base code is being run,
// it means the port doesn't implement this method yet and so alert the user.
virtual void ShowWithoutActivating() {
virtual void ShowWithoutActivating() {
wxFAIL_MSG("ShowWithoutActivating not implemented on this platform.");
}
@ -300,7 +300,7 @@ public:
// a different API for SetSizeHints
virtual void SetMinSize(const wxSize& minSize);
virtual void SetMaxSize(const wxSize& maxSize);
virtual void OSXSetModified(bool modified) { m_modified = modified; }
virtual bool OSXIsModified() const { return m_modified; }
@ -347,7 +347,7 @@ protected:
// a temporary override of m_winDefault, use the latter if NULL
wxWindowRef m_winTmpDefault;
bool m_modified;
wxDECLARE_NO_COPY_CLASS(wxTopLevelWindowBase);

2
include/wx/typeinfo.h
View File

@ -116,7 +116,7 @@ _WX_DECLARE_TYPEINFO_CUSTOM(CLS, sm_wxClassInfo)
#define wxTypeId(OBJ) (OBJ).GetWxTypeId()
// Because abstract classes cannot be instantiated, we use
// Because abstract classes cannot be instantiated, we use
// this macro to define pure virtual type interface for them.
#define WX_DECLARE_ABSTRACT_TYPEINFO(CLS) \
public: \

2
include/wx/unix/evtloop.h
View File

@ -25,7 +25,7 @@ namespace wxPrivate
class PipeIOHandler;
}
class WXDLLIMPEXP_BASE wxConsoleEventLoop
class WXDLLIMPEXP_BASE wxConsoleEventLoop
#ifdef __WXOSX__
: public wxCFEventLoop
#else

38
samples/access/accesstest.cpp
View File

@ -431,7 +431,7 @@ void MyFrame::OnQuery(wxCommandEvent& WXUNUSED(event))
accessibleFrame->Release();
return;
}
long obtained = 0;
VARIANT *var = new VARIANT[childCount];
@ -441,7 +441,7 @@ void MyFrame::OnQuery(wxCommandEvent& WXUNUSED(event))
VariantInit(& (var[i]));
var[i].vt = VT_DISPATCH;
}
if (S_OK == AccessibleChildren(accessibleFrame, 0, childCount, var, &obtained))
{
for (i = 0; i < childCount; i++)
@ -452,7 +452,7 @@ void MyFrame::OnQuery(wxCommandEvent& WXUNUSED(event))
if (var[i].pdispVal->QueryInterface(IID_IAccessible, (LPVOID*) & childAccessible) == S_OK)
{
var[i].pdispVal->Release();
wxString name, role;
GetInfo(childAccessible, 0, name, role);
wxString str;
@ -565,10 +565,10 @@ void MyFrame::GetInfo(IAccessible* accessible, int id, wxString& name, wxString&
VariantInit(& var);
var.vt = VT_I4;
var.lVal = id;
BSTR bStrName = 0;
HRESULT hResult = accessible->get_accName(var, & bStrName);
if (hResult == S_OK)
{
name = wxConvertStringFromOle(bStrName);
@ -578,23 +578,23 @@ void MyFrame::GetInfo(IAccessible* accessible, int id, wxString& name, wxString&
{
name = wxT("NO NAME");
}
VARIANT varRole;
VariantInit(& varRole);
hResult = accessible->get_accRole(var, & varRole);
if (hResult == S_OK && varRole.vt == VT_I4)
{
wxChar buf[256];
GetRoleText(varRole.lVal, buf, 256);
role = buf;
}
else
{
role = wxT("NO ROLE");
}
}
}
/*
@ -717,14 +717,14 @@ wxAccStatus SplitterWindowAccessible::Navigate(wxNavDir navDir, int fromId,
return wxACC_FALSE;
}
break;
case wxNAVDIR_LASTCHILD:
{
if (fromId == 2)
return wxACC_FALSE;
}
break;
case wxNAVDIR_LEFT:
{
if (splitter->GetSplitMode() != wxSPLIT_HORIZONTAL)
@ -748,7 +748,7 @@ wxAccStatus SplitterWindowAccessible::Navigate(wxNavDir navDir, int fromId,
// below line is not executed due to earlier return
break;
#endif
case wxNAVDIR_NEXT:
{
if (fromId == 1)
@ -769,7 +769,7 @@ wxAccStatus SplitterWindowAccessible::Navigate(wxNavDir navDir, int fromId,
// below line is not executed due to earlier return
break;
#endif
case wxNAVDIR_PREVIOUS:
{
if (fromId == 3)
@ -790,7 +790,7 @@ wxAccStatus SplitterWindowAccessible::Navigate(wxNavDir navDir, int fromId,
// below line is not executed due to earlier return
break;
#endif
case wxNAVDIR_RIGHT:
{
if (splitter->GetSplitMode() != wxSPLIT_HORIZONTAL)
@ -809,13 +809,13 @@ wxAccStatus SplitterWindowAccessible::Navigate(wxNavDir navDir, int fromId,
}
}
// Can't go right spatially if split horizontally.
return wxACC_FALSE;
return wxACC_FALSE;
}
#if 0
// below line is not executed due to earlier return
break;
#endif
case wxNAVDIR_UP:
{
if (splitter->GetSplitMode() != wxSPLIT_VERTICAL)
@ -834,14 +834,14 @@ wxAccStatus SplitterWindowAccessible::Navigate(wxNavDir navDir, int fromId,
}
// Can't go up spatially if split vertically.
return wxACC_FALSE;
return wxACC_FALSE;
#if 0
// below line is not executed due to earlier return
break;
#endif
}
}
}
// Let the framework handle the other cases.
return wxACC_NOT_IMPLEMENTED;

4
samples/caret/caret.cpp
View File

@ -226,7 +226,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
// ... and attach this menu bar to the frame
SetMenuBar(menuBar);
m_canvas = new MyCanvas(this);
#if wxUSE_STATUSBAR
@ -413,7 +413,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
wxPaintDC dc( this );
PrepareDC( dc );
dc.Clear();
dc.SetFont( m_font );
for ( int y = 0; y < m_yChars; y++ )

6
samples/console/console.cpp
View File

@ -16,10 +16,10 @@
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
@ -80,7 +80,7 @@ int main(int argc, char **argv)
// kill the last '\n'
input[wxStrlen(input) - 1] = 0;
if (wxStrcmp(input, "quit") == 0)
break;

12
samples/dataview/dataview.cpp
View File

@ -294,7 +294,7 @@ enum
ID_ADD_MANY = 203,
ID_HIDE_ATTRIBUTES = 204,
ID_SHOW_ATTRIBUTES = 205,
// Fourth page.
ID_DELETE_TREE_ITEM = 400,
ID_DELETE_ALL_TREE_ITEMS = 401,
@ -360,9 +360,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
#endif // wxUSE_DRAG_AND_DROP
EVT_RIGHT_UP(MyFrame::OnRightClick)
EVT_DATAVIEW_COLUMN_HEADER_CLICK(ID_ATTR_CTRL, MyFrame::OnAttrHeaderClick)
END_EVENT_TABLE()
MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int h):
@ -626,8 +626,8 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
m_ctrl[1]->AppendIconTextColumn("icon",
MyListModel::Col_IconText,
wxDATAVIEW_CELL_EDITABLE);
m_attributes =
m_attributes =
new wxDataViewColumn("attributes",
new wxDataViewTextRenderer,
MyListModel::Col_TextWithAttr,
@ -1195,7 +1195,7 @@ void MyFrame::OnDeleteTreeItem(wxCommandEvent& WXUNUSED(event))
wxDataViewItem selected = ctrl->GetSelection();
if (!selected.IsOk())
return;
ctrl->DeleteItem(selected);
}

2
samples/dataview/mymodels.cpp
View File

@ -348,7 +348,7 @@ void MyListModel::Prepend( const wxString &text )
void MyListModel::DeleteItem( const wxDataViewItem &item )
{
unsigned int row = GetRow( item );
if (row >= m_textColValues.GetCount())
return;

12
samples/dialogs/dialogs.cpp
View File

@ -809,7 +809,7 @@ void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event))
wxCENTER |
wxNO_DEFAULT | wxYES_NO | wxCANCEL |
wxICON_INFORMATION);
wxString extmsg;
if ( dialog.SetYesNoCancelLabels
(
@ -827,21 +827,21 @@ void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event))
"so the default \"Yes\"/\"No\"/\"Cancel\" buttons are used.";
}
dialog.SetExtendedMessage(extmsg);
switch ( dialog.ShowModal() )
{
case wxID_YES:
wxLogStatus(wxT("You pressed \"Yes\""));
break;
case wxID_NO:
wxLogStatus(wxT("You pressed \"No\""));
break;
case wxID_CANCEL:
wxLogStatus(wxT("You pressed \"Cancel\""));
break;
default:
wxLogError(wxT("Unexpected wxMessageDialog return code!"));
}
@ -2695,7 +2695,7 @@ bool TestMessageBoxDialog::Create()
};
wxCOMPILE_TIME_ASSERT( WXSIZEOF(icons) == MsgDlgIcon_Max, IconMismatch );
m_icons = new wxRadioBox(this, wxID_ANY, "&Icon style",
wxDefaultPosition, wxDefaultSize,
WXSIZEOF(icons), icons,

2
samples/docview/doc.h
View File

@ -166,7 +166,7 @@ class wxTextDocument : public wxDocument
public:
wxTextDocument() : wxDocument() { }
virtual bool OnCreate(const wxString& path, long flags);
virtual bool OnCreate(const wxString& path, long flags);
virtual wxTextCtrl* GetTextCtrl() const = 0;

2
samples/docview/view.cpp
View File

@ -88,7 +88,7 @@ void DrawingView::OnDraw(wxDC *dc)
++i )
{
const DoodleLines& lines = i->GetLines();
for ( DoodleLines::const_iterator j = lines.begin();
for ( DoodleLines::const_iterator j = lines.begin();
j != lines.end();
++j )
{

6
samples/dragimag/dragimag.cpp
View File

@ -142,7 +142,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
m_currentlyHighlighted = (DragShape*) NULL;
m_draggedShape = (DragShape*) NULL;
Refresh(true);
}
else if (event.Dragging() && m_dragMode != TEST_DRAG_NONE)
@ -230,7 +230,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
if (mustUnhighlightOld || mustHighlightNew)
m_dragImage->Hide();
// Now with the drag image switched off, we can change the window contents.
if (mustUnhighlightOld)
m_currentlyHighlighted = (DragShape*) NULL;
@ -475,7 +475,7 @@ bool DragShape::Draw(wxDC& dc, bool highlight)
dc.Blit(m_pos.x, m_pos.y, m_bitmap.GetWidth(), m_bitmap.GetHeight(),
& memDC, 0, 0, wxCOPY, true);
if (highlight)
{
dc.SetPen(*wxWHITE_PEN);

4
samples/flash/flash.cpp
View File

@ -21,9 +21,9 @@
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif

44
samples/font/font.cpp
View File

@ -102,10 +102,10 @@ public:
void OnBold(wxCommandEvent& event);
void OnLight(wxCommandEvent& event);
void OnItalic(wxCommandEvent& event);
void OnSlant(wxCommandEvent& event);
void OnUnderline(wxCommandEvent& event);
void OnwxPointerFont(wxCommandEvent& event);
@ -123,7 +123,7 @@ public:
void OnSetNativeDesc(wxCommandEvent& event);
void OnSetNativeUserDesc(wxCommandEvent& event);
void OnSetFamily(wxCommandEvent& event);
void OnSetFaceName(wxCommandEvent& event);
void OnSetEncoding(wxCommandEvent& event);
@ -164,21 +164,21 @@ enum
// menu items
Font_Quit = wxID_EXIT,
Font_About = wxID_ABOUT,
Font_ViewMsg = wxID_HIGHEST+1,
Font_TestTextValue,
Font_IncSize,
Font_DecSize,
Font_Bold,
Font_Light,
Font_Italic,
Font_Slant,
Font_Underlined,
// standard global wxFont objects:
Font_wxNORMAL_FONT,
Font_wxSMALL_FONT,
@ -223,13 +223,13 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(Font_IncSize, MyFrame::OnIncFont)
EVT_MENU(Font_DecSize, MyFrame::OnDecFont)
EVT_MENU(Font_Bold, MyFrame::OnBold)
EVT_MENU(Font_Light, MyFrame::OnLight)
EVT_MENU(Font_Italic, MyFrame::OnItalic)
EVT_MENU(Font_Slant, MyFrame::OnSlant)
EVT_MENU(Font_Underlined, MyFrame::OnUnderline)
EVT_MENU(Font_wxNORMAL_FONT, MyFrame::OnwxPointerFont)
@ -339,7 +339,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
wxT("Set &user font description\tShift-Ctrl-U"));
menuFont->AppendSeparator();
menuFont->Append(Font_SetFamily, wxT("Set font family"));
menuFont->Append(Font_SetFaceName, wxT("Set font face name"));
menuFont->Append(Font_SetFaceName, wxT("Set font face name"));
menuFont->Append(Font_SetEncoding, wxT("Set font &encoding\tShift-Ctrl-E"));
wxMenu *menuSelect = new wxMenu;
@ -354,21 +354,21 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
menuSelect->Append(Font_Standard, wxT("Standar&d fonts"), menuStdFonts);
wxMenu *menuSettingFonts = new wxMenu;
menuSettingFonts->Append(Font_wxSYS_OEM_FIXED_FONT, wxT("wxSYS_OEM_FIXED_FONT"),
menuSettingFonts->Append(Font_wxSYS_OEM_FIXED_FONT, wxT("wxSYS_OEM_FIXED_FONT"),
wxT("Original equipment manufacturer dependent fixed-pitch font."));
menuSettingFonts->Append(Font_wxSYS_ANSI_FIXED_FONT, wxT("wxSYS_ANSI_FIXED_FONT"),
menuSettingFonts->Append(Font_wxSYS_ANSI_FIXED_FONT, wxT("wxSYS_ANSI_FIXED_FONT"),
wxT("Windows fixed-pitch (monospaced) font. "));
menuSettingFonts->Append(Font_wxSYS_ANSI_VAR_FONT, wxT("wxSYS_ANSI_VAR_FONT"),
menuSettingFonts->Append(Font_wxSYS_ANSI_VAR_FONT, wxT("wxSYS_ANSI_VAR_FONT"),
wxT("Windows variable-pitch (proportional) font."));
menuSettingFonts->Append(Font_wxSYS_SYSTEM_FONT, wxT("wxSYS_SYSTEM_FONT"),
menuSettingFonts->Append(Font_wxSYS_SYSTEM_FONT, wxT("wxSYS_SYSTEM_FONT"),
wxT("System font."));
menuSettingFonts->Append(Font_wxSYS_DEVICE_DEFAULT_FONT, wxT("wxSYS_DEVICE_DEFAULT_FONT"),
wxT("Device-dependent font."));
menuSettingFonts->Append(Font_wxSYS_DEFAULT_GUI_FONT, wxT("wxSYS_DEFAULT_GUI_FONT"),
menuSettingFonts->Append(Font_wxSYS_DEFAULT_GUI_FONT, wxT("wxSYS_DEFAULT_GUI_FONT"),
wxT("Default font for user interface objects such as menus and dialog boxes. "));
menuSelect->Append(Font_SystemSettings, wxT("System fonts"), menuSettingFonts);
menuSelect->AppendSeparator();
menuSelect->Append(Font_EnumFamilies, wxT("Enumerate font &families\tCtrl-F"));
menuSelect->Append(Font_EnumFixedFamilies,
@ -821,12 +821,12 @@ void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col)
{
mbar->Check(Font_Light, font.GetWeight() == wxFONTWEIGHT_LIGHT);
mbar->Check(Font_Bold, font.GetWeight() == wxFONTWEIGHT_BOLD);
mbar->Check(Font_Italic, font.GetStyle() == wxFONTSTYLE_ITALIC);
#ifndef __WXMSW__
mbar->Check(Font_Slant, font.GetStyle() == wxFONTSTYLE_SLANT);
#endif
mbar->Check(Font_Underlined, font.GetUnderlined());
}
}
@ -1023,7 +1023,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
// output the font name/info
wxString fontInfo;
fontInfo.Printf(wxT("Face name: %s, family: %s"),
m_font.GetFaceName().c_str(),
m_font.GetFamilyString().c_str());

4
samples/help/demo.cpp
View File

@ -461,10 +461,10 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
m_embeddedHelpWindow = new wxHtmlHelpWindow;
// m_embeddedHtmlHelp.UseConfig(config, rootPath); // Can set your own config object here
m_embeddedHtmlHelp.SetHelpWindow(m_embeddedHelpWindow);
m_embeddedHelpWindow->Create(this,
wxID_ANY, wxDefaultPosition, GetClientSize(), wxTAB_TRAVERSAL|wxNO_BORDER, wxHF_DEFAULT_STYLE);
m_embeddedHtmlHelp.AddBook(wxFileName(wxT("doc.zip")));
m_embeddedHtmlHelp.Display(wxT("Introduction"));
#else

6
samples/layout/expt.cpp
View File

@ -4,9 +4,9 @@
* the original, so abandoned.
Example:
wxConstrain(frame->panel,
( leftOf (frame->panel) = leftOf (frame),
topOf (frame->panel) = topOf (frame),
rightOf (frame->panel) = rightOf (frame),
@ -70,7 +70,7 @@ class wxConstraintOp: public wxObject
wxConstraintOp operator = (const wxConstraintOp& arg2);
wxConstraintOp operator = (const int value);
friend wxConstraintOp operator % (const int perCent, const wxConstraintOp& arg2);
friend wxConstraintOp operator + (wxConstraintOp& arg1, int margin);
friend wxConstraintOp operator - (wxConstraintOp& arg1, int margin);

8
samples/layout/layout.h
View File

@ -103,10 +103,10 @@ class MySimpleSizerFrame : public wxFrame
{
public:
MySimpleSizerFrame(const wxString &title, int x, int y );
void OnSetSmallSize( wxCommandEvent &event);
void OnSetBigSize( wxCommandEvent &event);
private:
wxTextCtrl *m_target;
@ -121,8 +121,8 @@ class MyNestedSizerFrame : public wxFrame
{
public:
MyNestedSizerFrame(const wxString &title, int x, int y );
private:
wxTextCtrl *m_target;
};

2
samples/listctrl/listtest.cpp
View File

@ -283,7 +283,7 @@ MyFrame::MyFrame(const wxChar *title)
#ifdef __WXMSW__
// this is useful to know specially when debugging :)
wxLogMessage("Your version of comctl32.dll is: %d",
wxLogMessage("Your version of comctl32.dll is: %d",
wxApp::GetComCtl32Version());
#endif

2
samples/mfc/mfctest.cpp
View File

@ -39,7 +39,7 @@
// nmake -f makefile.vc BUILD=debug SHARED=0 DEBUG_RUNTIME_LIBS=0 RUNTIME_LIBS=static all
//
// Unless the run-time library settings match for wxWidgets and MFC, you
// will get link errors for symbols such as __mbctype, __argc, and __argv
// will get link errors for symbols such as __mbctype, __argc, and __argv
//
// (3) If you see bogus memory leaks within the MSVC IDE on exit, in this
// sample or in your own project, you must be using __WXDEBUG__ +

2
samples/mfc/resource.h
View File

@ -6,7 +6,7 @@
#define IDM_TEST 101
// Next default values for new objects
//
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS

4
samples/minimal/minimal.cpp
View File

@ -16,10 +16,10 @@
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif

2
samples/nativdlg/resource.h
View File

@ -14,7 +14,7 @@
#define IDC_STATIC -1
// Next default values for new objects
//
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 102

10
samples/notebook/notebook.cpp
View File

@ -89,14 +89,14 @@ wxPanel *CreateRadioButtonsPage(wxBookCtrlBase *parent)
panel->SetHelpText( wxT( "Panel with some Radio Buttons" ) );
#endif
wxString animals[] =
wxString animals[] =
{ wxT("Fox"), wxT("Hare"), wxT("Rabbit"),
wxT("Sabre-toothed tiger"), wxT("T Rex") };
wxRadioBox *radiobox1 = new wxRadioBox(panel, wxID_ANY, wxT("Choose one"),
wxDefaultPosition, wxDefaultSize, 5, animals, 2, wxRA_SPECIFY_ROWS);
wxString computers[] =
wxString computers[] =
{ wxT("Amiga"), wxT("Commodore 64"), wxT("PET"),
wxT("Another") };
@ -121,7 +121,7 @@ wxPanel *CreateVetoPage(wxBookCtrlBase *parent)
#endif
(void) new wxStaticText( panel, wxID_ANY,
wxT("This page intentionally left blank"),
wxT("This page intentionally left blank"),
wxPoint(10, 10) );
return panel;
@ -154,7 +154,7 @@ wxPanel *CreateInsertPage(wxBookCtrlBase *parent)
panel->SetBackgroundColour( wxColour( wxT("MAROON") ) );
(void) new wxStaticText( panel, wxID_ANY,
wxT("This page has been inserted, not added."),
wxT("This page has been inserted, not added."),
wxPoint(10, 10) );
return panel;
@ -579,7 +579,7 @@ void MyFrame::RecreateBook()
m_sizerFrame->Layout();
}
void MyFrame::AddFlagStrIfFlagPresent(wxString & flagStr, long flags, long flag,
void MyFrame::AddFlagStrIfFlagPresent(wxString & flagStr, long flags, long flag,
const wxChar * flagName) const
{
if( (flags & flag) == flag )

2
samples/opengl/cube/cube.cpp
View File

@ -161,7 +161,7 @@ TestGLContext::TestGLContext(wxGLCanvas *canvas)
const wxImage img(DrawDice(256, i + 1));
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, img.GetWidth(), img.GetHeight(),
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, img.GetWidth(), img.GetHeight(),
0, GL_RGB, GL_UNSIGNED_BYTE, img.GetData());
}

2
samples/opengl/isosurf/isosurf.cpp
View File

@ -232,7 +232,7 @@ void TestGLCanvas::LoadSurface(const wxString& filename)
wxLogMessage(wxT("Loaded %d vertices, %d triangles from '%s'"),
m_numverts, m_numverts-2, filename.c_str());
// NOTE: for some reason under wxGTK the following is required to avoid that
// the surface gets rendered in a small rectangle in the top-left corner of the frame
PostSizeEventToParent();

2
samples/propgrid/propgrid.cpp
View File

@ -1646,7 +1646,7 @@ void FormMain::PopulateWithExamples ()
mdc.DrawLine(0, 0, 60, 15);
mdc.SelectObject(wxNullBitmap);
pg->SetPropertyImage( wxT("StringPropertyWithBitmap"), myTestBitmap );
// this value array would be optional if values matched string indexes
//long flags_prop_values[] = { wxICONIZE, wxCAPTION, wxMINIMIZE_BOX, wxMAXIMIZE_BOX };

2
samples/propgrid/tests.cpp
View File

@ -1131,7 +1131,7 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
InitPanel();
const int trySplitterPos = 50;
int style = wxPG_AUTO_SORT; // wxPG_SPLITTER_AUTO_CENTER;
pgman = m_pPropGridManager =
new wxPropertyGridManager(m_panel, wxID_ANY,

12
samples/ribbon/ribbondemo.cpp
View File

@ -249,18 +249,18 @@ MyFrame::MyFrame()
shapes->AddButton(ID_SQUARE, wxT("Square"), wxBitmap(square_xpm), wxEmptyString);
shapes->AddDropdownButton(ID_POLYGON, wxT("Other Polygon"), wxBitmap(hexagon_xpm), wxEmptyString);
wxRibbonPanel *sizer_panel = new wxRibbonPanel(home, wxID_ANY, wxT("Panel with Sizer"),
wxNullBitmap, wxDefaultPosition, wxDefaultSize,
wxRibbonPanel *sizer_panel = new wxRibbonPanel(home, wxID_ANY, wxT("Panel with Sizer"),
wxNullBitmap, wxDefaultPosition, wxDefaultSize,
wxRIBBON_PANEL_EXT_BUTTON);
wxArrayString as;
as.Add("Item 1");
as.Add("Item 2");
wxComboBox* sizer_panelcombo = new wxComboBox(sizer_panel, wxID_ANY, wxEmptyString,
wxComboBox* sizer_panelcombo = new wxComboBox(sizer_panel, wxID_ANY, wxEmptyString,
wxDefaultPosition, wxDefaultSize, as, wxCB_READONLY);
wxComboBox* sizer_panelcombo2 = new wxComboBox(sizer_panel, wxID_ANY, wxEmptyString,
wxComboBox* sizer_panelcombo2 = new wxComboBox(sizer_panel, wxID_ANY, wxEmptyString,
wxDefaultPosition, wxDefaultSize, as, wxCB_READONLY);
sizer_panelcombo->SetMinSize(wxSize(150, -1));
sizer_panelcombo2->SetMinSize(wxSize(150, -1));
@ -360,7 +360,7 @@ wxRibbonGallery* MyFrame::PopulateColoursPanel(wxWindow* panel,
else
gallery = new wxRibbonGallery(panel, gallery_id);
wxMemoryDC& dc = m_bitmap_creation_dc;
wxRibbonGalleryItem *def_item =
wxRibbonGalleryItem *def_item =
AddColourToGallery(gallery, wxT("Default"), dc, &def);
gallery->SetSelection(def_item);
AddColourToGallery(gallery, wxT("BLUE"), dc);

6
samples/sockets/baseclient.cpp
View File

@ -306,9 +306,9 @@ Client::OnExit()
return 0;
}
// Create buffer to be sent by client. Buffer contains test indicator
// Create buffer to be sent by client. Buffer contains test indicator
// message size and place for data
// msgsize parameter contains size of data in bytes and
// msgsize parameter contains size of data in bytes and
// if input value does not fit into 250 bytes then
// on exit is updated to new value that is multiply of 1024 bytes
char*
@ -318,7 +318,7 @@ Client::CreateBuffer(int* msgsize)
char* buf;
//if message should have more than 256 bytes then set it as
//test3 for compatibility with GUI server sample
if ((*msgsize) > 250)
if ((*msgsize) > 250)
{
//send at least one kb of data
int size = (*msgsize)/1024 + 1;

2
samples/stc/edit.h
View File

@ -48,7 +48,7 @@ public:
Edit (wxWindow *parent, wxWindowID id = wxID_ANY,
const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
long style =
long style =
#ifndef __WXMAC__
wxSUNKEN_BORDER|
#endif

22
samples/svg/svgtest.cpp
View File

@ -66,29 +66,29 @@ public:
void OnNewWindow(wxCommandEvent& event);
void OnQuit(wxCommandEvent& event);
void FileSavePicture (wxCommandEvent& event);
unsigned int GetCountOfChildren() const
{ return m_nWinCreated; }
private:
unsigned int m_nWinCreated;
DECLARE_EVENT_TABLE()
};
class MyChild: public wxMDIChildFrame
{
public:
MyChild(wxMDIParentFrame *parent, const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
MyChild(wxMDIParentFrame *parent, const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
const long style = wxDEFAULT_FRAME_STYLE);
~MyChild();
void OnActivate(wxActivateEvent& event);
void OnQuit(wxCommandEvent& event);
bool OnSave(wxString filename);
MyFrame* GetFrame()
{ return m_frame; }
@ -108,7 +108,7 @@ public:
private:
int m_index;
MyChild* m_child;
DECLARE_EVENT_TABLE()
};
@ -213,7 +213,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
{
(void)wxMessageBox(wxT("wxWidgets SVG sample\n")
wxT("Author: Chris Elliott (c) 2002-2009\n")
wxT("Usage: click File|New to show tests"),
wxT("Usage: click File|New to show tests"),
wxT("About SVG Test"));
}
@ -224,7 +224,7 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
wxString title;
title.Printf(wxT("SVG Test Window %d"), m_nWinCreated );
// counts number of children previously, even if now closed
m_nWinCreated ++;
@ -519,14 +519,14 @@ MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title,
: wxMDIChildFrame(parent, wxID_ANY, title, pos, size, style)
{
m_frame = (MyFrame *) parent;
#if wxUSE_STATUSBAR
CreateStatusBar();
SetStatusText(title);
#endif // wxUSE_STATUSBAR
m_canvas = new MyCanvas(this, wxPoint(0, 0), GetClientSize());
// Give it scrollbars
m_canvas->SetScrollbars(20, 20, 50, 50);
}

2
samples/toolbar/toolbar.cpp
View File

@ -642,7 +642,7 @@ MyFrame::MyFrame(wxFrame* parent,
m_extraToolBar = new wxToolBar(m_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_TEXT|wxTB_FLAT|wxTB_TOP);
PopulateToolbar(m_extraToolBar);
#endif
m_textWindow = new wxTextCtrl(m_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);

6
samples/treectrl/treetest.cpp
View File

@ -807,7 +807,7 @@ void MyFrame::OnDecSpacing(wxCommandEvent& WXUNUSED(event))
{
m_treeCtrl->SetSpacing( indent-5 );
m_treeCtrl->Refresh();
}
}
}
void MyFrame::OnToggleIcon(wxCommandEvent& WXUNUSED(event))
@ -1024,10 +1024,10 @@ void MyTreeCtrl::CreateStateImageList(bool del)
wxIcon icons[2];
icons[0] = wxIcon(unchecked_xpm);
icons[1] = wxIcon(checked_xpm);
int width = icons[0].GetWidth(),
height = icons[0].GetHeight();
// Make an state image list containing small icons
states = new wxImageList(width, height, true);

2
samples/widgets/gauge.cpp
View File

@ -303,7 +303,7 @@ void GaugeWidgetsPage::CreateGauge()
wxDefaultPosition, wxDefaultSize,
flags);
m_gauge->SetValue(val);
if ( flags & wxGA_VERTICAL )
m_sizerGauge->Add(m_gauge, 0, wxGROW | wxALL, 5);
else

18
samples/widgets/searchctrl.cpp
View File

@ -5,7 +5,7 @@
// Author: Robin Dunn
// Created: 9-Dec-2006
// Id: $Id$
// Copyright: (c) 2006
// Copyright: (c) 2006
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -87,14 +87,14 @@ protected:
void OnSearch(wxCommandEvent& event);
wxMenu* CreateTestMenu();
// (re)create the control
void CreateControl();
// reset the control parameters
void Reset();
wxSearchCtrl* m_srchCtrl;
wxCheckBox* m_searchBtnCheck;
wxCheckBox* m_cancelBtnCheck;
@ -153,7 +153,7 @@ void SearchCtrlWidgetsPage::CreateContent()
m_menuBtnCheck = new wxCheckBox(this, ID_MENU_CB, wxT("Search menu"));
m_searchBtnCheck->SetValue(true);
box->Add(m_searchBtnCheck, 0, wxALL, 5);
box->Add(m_cancelBtnCheck, 0, wxALL, 5);
box->Add(m_menuBtnCheck, 0, wxALL, 5);
@ -171,13 +171,13 @@ void SearchCtrlWidgetsPage::CreateControl()
m_srchCtrl->Destroy();
int style = 0;
m_srchCtrl = new wxSearchCtrl(this, -1, wxEmptyString, wxDefaultPosition,
wxSize(150, -1), style);
}
void SearchCtrlWidgetsPage::Reset()
{
{
}
@ -193,7 +193,7 @@ wxMenu* SearchCtrlWidgetsPage::CreateTestMenu()
wxString tipText = wxString::Format(wxT("tip %i"),i);
menu->Append(ID_SEARCHMENU+i, itemText, tipText, wxITEM_NORMAL);
}
// target->Connect(
// target->Connect(
// ID_SEARCHMENU,
// ID_SEARCHMENU+SEARCH_MENU_SIZE,
// wxEVT_COMMAND_MENU_SELECTED,
@ -215,7 +215,7 @@ void SearchCtrlWidgetsPage::OnToggleSearchButton(wxCommandEvent&)
void SearchCtrlWidgetsPage::OnToggleCancelButton(wxCommandEvent&)
{
m_srchCtrl->ShowCancelButton( m_cancelBtnCheck->GetValue() );
}
void SearchCtrlWidgetsPage::OnToggleSearchMenu(wxCommandEvent&)

6
src/common/colourcmn.cpp
View File

@ -150,7 +150,7 @@ wxString wxColourBase::GetAsString(long flags) const
}
// static
void wxColourBase::MakeMono(unsigned char* r, unsigned char* g, unsigned char* b,
void wxColourBase::MakeMono(unsigned char* r, unsigned char* g, unsigned char* b,
bool on)
{
*r = *g = *b = on ? 255 : 0;
@ -173,7 +173,7 @@ void wxColourBase::MakeGrey(unsigned char* r, unsigned char* g, unsigned char* b
}
// static
void wxColourBase::MakeDisabled(unsigned char* r, unsigned char* g, unsigned char* b,
void wxColourBase::MakeDisabled(unsigned char* r, unsigned char* g, unsigned char* b,
unsigned char brightness)
{
//MakeGrey(r, g, b, brightness); // grey no-blend version
@ -185,7 +185,7 @@ void wxColourBase::MakeDisabled(unsigned char* r, unsigned char* g, unsigned cha
// AlphaBlend is used by ChangeLightness and MakeDisabled
// static
unsigned char wxColourBase::AlphaBlend(unsigned char fg, unsigned char bg,
unsigned char wxColourBase::AlphaBlend(unsigned char fg, unsigned char bg,
double alpha)
{
double result = bg + (alpha * (fg - bg));

6
src/common/combocmn.cpp
View File

@ -235,10 +235,10 @@ static inline bool IsPopupWinTypePerfect( wxByte popupWinType )
#else
return ( popupWinType == POPUPWIN_GENERICTLW
#if POPUPWIN_IS_PERFECT
|| popupWinType == POPUPWIN_WXPOPUPWINDOW
|| popupWinType == POPUPWIN_WXPOPUPWINDOW
#endif
#if TRANSIENT_POPUPWIN_IS_PERFECT
|| popupWinType == POPUPWIN_WXPOPUPTRANSIENTWINDOW
|| popupWinType == POPUPWIN_WXPOPUPTRANSIENTWINDOW
#endif
);
#endif
@ -1202,7 +1202,7 @@ void wxComboCtrlBase::PositionTextCtrl( int textCtrlXAdjust, int textCtrlYAdjust
// There is special custom paint area - it is better to
// use some margin with the wxTextCtrl.
m_text->SetMargins(m_marginLeft);
x = m_tcArea.x + m_widthCustomPaint +
x = m_tcArea.x + m_widthCustomPaint +
m_marginLeft + textCtrlXAdjust;
}

8
src/common/ctrlcmn.cpp
View File

@ -298,7 +298,7 @@ wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxD
// NOTE: the following piece of code works also when len == 1
// start the removal process from the middle of the string
// i.e. separe the string in three parts:
// i.e. separe the string in three parts:
// - the first one to preserve, valid range [0;initialCharToRemove-1] or the empty range if initialCharToRemove==0
// - the second one to remove, valid range [initialCharToRemove;endCharToRemove]
// - the third one to preserve, valid range [endCharToRemove+1;len-1] or the empty range if endCharToRemove==len-1
@ -317,9 +317,9 @@ wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxD
if (initialCharToRemove >= 2)
widthPx = charOffsetsPx[initialCharToRemove-1] - charOffsetsPx[initialCharToRemove-2];
else
widthPx = charOffsetsPx[initialCharToRemove-1];
widthPx = charOffsetsPx[initialCharToRemove-1];
// the (initialCharToRemove-1)-th character is the first char of the string
wxASSERT(widthPx >= 0); // widthPx is zero for e.g. tab characters
// mark the (initialCharToRemove-1)-th character as removable
@ -394,7 +394,7 @@ wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxD
int removedPx;
if (initialCharToRemove >= 1)
removedPx = charOffsetsPx[initialCharToRemove+nCharsToRemove-1] - charOffsetsPx[initialCharToRemove-1];
else
else
removedPx = charOffsetsPx[initialCharToRemove+nCharsToRemove-1];
wxASSERT(removedPx >= excessPx);

12
src/common/datavcmn.cpp
View File

@ -376,7 +376,7 @@ wxDataViewIndexListModel::wxDataViewIndexListModel( unsigned int initial_size )
void wxDataViewIndexListModel::Reset( unsigned int new_size )
{
/* wxDataViewModel:: */ BeforeReset();
m_hash.Clear();
// IDs are ordered until an item gets deleted or inserted
@ -534,7 +534,7 @@ void wxDataViewVirtualListModel::Reset( unsigned int new_size )
/* wxDataViewModel:: */ BeforeReset();
m_size = new_size;
/* wxDataViewModel:: */ AfterReset();
}
@ -1487,11 +1487,11 @@ wxDataViewChoiceByIndexRenderer::wxDataViewChoiceByIndexRenderer( const wxArrayS
wxDataViewChoiceRenderer( choices, mode, alignment )
{
}
wxControl* wxDataViewChoiceByIndexRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )
{
wxVariant string_value = GetChoice( value.GetLong() );
return wxDataViewChoiceRenderer::CreateEditorCtrl( parent, labelRect, string_value );
}
@ -1510,13 +1510,13 @@ bool wxDataViewChoiceByIndexRenderer::SetValue( const wxVariant &value )
wxVariant string_value = GetChoice( value.GetLong() );
return wxDataViewChoiceRenderer::SetValue( string_value );
}
bool wxDataViewChoiceByIndexRenderer::GetValue( wxVariant &value ) const
{
wxVariant string_value;
if (!wxDataViewChoiceRenderer::GetValue( string_value ))
return false;
value = (long) GetChoices().Index( string_value.GetString() );
return true;
}

2
src/common/dcbufcmn.cpp
View File

@ -132,7 +132,7 @@ void wxBufferedDC::UnMask()
// Ensure the scale matches the device
SetUserScale(1.0, 1.0);
if ( m_style & wxBUFFER_CLIENT_AREA )
GetDeviceOrigin(&x, &y);

2
src/common/dircmn.cpp
View File

@ -377,5 +377,5 @@ bool wxDir::Remove(const wxString &dir, int flags)
{
return wxFileName::Rmdir(dir, flags);
}
#endif // wxUSE_LONGLONG

2
src/common/gdicmn.cpp
View File

@ -253,7 +253,7 @@ wxRect operator*(const wxRect& r1, const wxRect& r2)
}
wxRealPoint::wxRealPoint(const wxPoint& pt)
: x(pt.x), y(pt.y)
: x(pt.x), y(pt.y)
{
}

52
src/common/glcmn.cpp
View File

@ -59,7 +59,7 @@ bool wxGLCanvasBase::SetCurrent(const wxGLContext& context) const
// that SetCurrent() can only be called for a shown window, so check for it
wxASSERT_MSG( IsShownOnScreen(), wxT("can't make hidden GL canvas current") );
return context.SetCurrent(*static_cast<const wxGLCanvas *>(this));
}
@ -70,14 +70,14 @@ bool wxGLCanvasBase::SetColour(const wxString& colour)
return false;
#ifdef wxHAS_OPENGL_ES
wxGLAPI::glColor3f((GLfloat) (col.Red() / 256.), (GLfloat) (col.Green() / 256.),
wxGLAPI::glColor3f((GLfloat) (col.Red() / 256.), (GLfloat) (col.Green() / 256.),
(GLfloat) (col.Blue() / 256.));
#else
GLboolean isRGBA;
glGetBooleanv(GL_RGBA_MODE, &isRGBA);
if ( isRGBA )
{
glColor3f((GLfloat) (col.Red() / 256.), (GLfloat) (col.Green() / 256.),
glColor3f((GLfloat) (col.Red() / 256.), (GLfloat) (col.Green() / 256.),
(GLfloat) (col.Blue() / 256.));
}
else // indexed colour
@ -184,7 +184,7 @@ bool SetState( int flag, bool desired )
if ( desired )
glEnableClientState(flag);
else
glDisableClientState(flag);
glDisableClientState(flag);
}
return former;
}
@ -194,7 +194,7 @@ void RestoreState( int flag, bool desired )
if ( desired )
glEnableClientState(flag);
else
glDisableClientState(flag);
glDisableClientState(flag);
}
#endif
@ -209,7 +209,7 @@ wxGLAPI::~wxGLAPI()
{
}
void wxGLAPI::glFrustum(GLfloat left, GLfloat right, GLfloat bottom,
void wxGLAPI::glFrustum(GLfloat left, GLfloat right, GLfloat bottom,
GLfloat top, GLfloat zNear, GLfloat zFar)
{
#if wxUSE_OPENGL_EMULATION
@ -226,12 +226,12 @@ void wxGLAPI::glBegin(GLenum mode)
{
wxFAIL_MSG("nested glBegin");
}
s_mode = mode;
s_texCoordsUsed = false;
s_colorsUsed = false;
s_normalsUsed = false;
s_texCoords.clear();
s_normals.clear();
s_colors.clear();
@ -248,7 +248,7 @@ void wxGLAPI::glTexCoord2f(GLfloat s, GLfloat t)
{
wxFAIL_MSG("glTexCoord2f called outside glBegin/glEnd");
}
else
{
s_texCoordsUsed = true;
@ -271,16 +271,16 @@ void wxGLAPI::glVertex3f(GLfloat x, GLfloat y, GLfloat z)
{
s_texCoords.push_back(s_currentTexCoord[0]);
s_texCoords.push_back(s_currentTexCoord[1]);
s_normals.push_back(s_currentNormal[0]);
s_normals.push_back(s_currentNormal[1]);
s_normals.push_back(s_currentNormal[2]);
s_colors.push_back(s_currentColor[0]);
s_colors.push_back(s_currentColor[1]);
s_colors.push_back(s_currentColor[2]);
s_colors.push_back(s_currentColor[3]);
s_vertices.push_back(x);
s_vertices.push_back(y);
s_vertices.push_back(z);
@ -298,9 +298,9 @@ void wxGLAPI::glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
else
{
s_normalsUsed = true;
s_currentNormal[0] = nx;
s_currentNormal[1] = ny;
s_currentNormal[2] = nz;
s_currentNormal[0] = nx;
s_currentNormal[1] = ny;
s_currentNormal[2] = nz;
}
#else
::glNormal3f(nx,ny,nz);
@ -328,7 +328,7 @@ void wxGLAPI::glColor4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a)
void wxGLAPI::glColor3f(GLfloat r, GLfloat g, GLfloat b)
{
#if wxUSE_OPENGL_EMULATION
glColor4f(r,g,b,1.0);
glColor4f(r,g,b,1.0);
#else
::glColor3f(r,g,b);
#endif
@ -341,34 +341,34 @@ void wxGLAPI::glEnd()
bool formerNormals = SetState( GL_NORMAL_ARRAY, s_normalsUsed );
bool formerTexCoords = SetState( GL_TEXTURE_COORD_ARRAY, s_texCoordsUsed );
bool formerVertex = glIsEnabled(GL_VERTEX_ARRAY);
if( !formerVertex )
glEnableClientState(GL_VERTEX_ARRAY);
if ( s_colorsUsed )
glColorPointer( 4, GL_FLOAT, 0, &s_colors[0] );
if ( s_normalsUsed )
glNormalPointer( GL_FLOAT, 0, &s_normals[0] );
if ( s_texCoordsUsed )
glTexCoordPointer( 2, GL_FLOAT, 0, &s_texCoords[0] );
glVertexPointer(3, GL_FLOAT, 0, &s_vertices[0]);
glDrawArrays( s_mode, 0, s_vertices.size() / 3 );
if ( s_colorsUsed != formerColors )
RestoreState( GL_COLOR_ARRAY, formerColors );
if ( s_normalsUsed != formerNormals )
RestoreState( GL_NORMAL_ARRAY, formerColors );
if ( s_texCoordsUsed != formerTexCoords )
RestoreState( GL_TEXTURE_COORD_ARRAY, formerColors );
if( !formerVertex )
glDisableClientState(GL_VERTEX_ARRAY);
s_mode = 0xFF;
#else
::glEnd();

2
src/common/stattextcmn.cpp
View File

@ -169,7 +169,7 @@ void wxStaticTextBase::SetLabelText(const wxString& text)
wxString wxStaticTextBase::GetLabelText(const wxString& label)
{
wxString ret = RemoveMarkup(label);
// always remove the markup (this function is static
// always remove the markup (this function is static
// and cannot check for wxST_MARKUP presence/absence)
return RemoveMnemonics(ret);

10
src/generic/datavgen.cpp
View File

@ -95,7 +95,7 @@ void wxDataViewColumn::Init(int width, wxAlignment align, int flags)
m_sort = false;
m_sortAscending = true;
}
void wxDataViewColumn::UpdateDisplay()
{
if (m_owner)
@ -3815,7 +3815,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
else if ( align & wxALIGN_BOTTOM )
rectItem.y += cell_rect.height - size.y;
// else: wxALIGN_TOP is the default
}
}
}
wxPoint pos( event.GetPosition() );
@ -4146,7 +4146,7 @@ int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
if (column==col)
return i;
}
return wxNOT_FOUND;
#else
// This returns the position in pixels which is not what we want.
@ -4248,9 +4248,9 @@ void wxDataViewCtrl::Select( const wxDataViewItem & item )
// Unselect all rows before select another in the single select mode
if (m_clientArea->IsSingleSel())
m_clientArea->SelectAllRows(false);
m_clientArea->SelectRow(row, true);
// Also set focus to the selected item
m_clientArea->ChangeCurrentRow( row );
}

2
src/generic/dirctrlg.cpp
View File

@ -1107,7 +1107,7 @@ wxString wxGenericDirCtrl::GetPath() const
wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(id);
return data->m_path;
}
return wxEmptyString;
}

2
src/generic/splitter.cpp
View File

@ -196,7 +196,7 @@ void wxSplitterWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
wxPaintDC dc(this);
#ifdef __WXOSX__
// as subpanels might have a transparent background we must erase the background
// at least on OSX, otherwise traces of the sash will remain
// at least on OSX, otherwise traces of the sash will remain
// test with: splitter sample->replace right window
dc.Clear();
#endif

6
src/gtk/app.cpp
View File

@ -513,8 +513,8 @@ void wxGUIAppTraits::MutexGuiLeave()
#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
// Maemo-specific method: get the main program object
HildonProgram *wxApp::GetHildonProgram()
{
return hildon_program_get_instance();
{
return hildon_program_get_instance();
}
#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2

2
src/gtk/bitmap.cpp
View File

@ -794,7 +794,7 @@ bool wxBitmap::HasPixbuf() const
void wxBitmap::SetPixbuf(GdkPixbuf* pixbuf)
{
UnRef();
if (!pixbuf)
return;

2
src/gtk/choice.cpp
View File

@ -142,7 +142,7 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
// the right insertion point
if (m_strings)
n = m_strings->Add(items[i]);
GTKInsertComboBoxTextItem( n, items[i] );
m_clientData.Insert( NULL, n );

4
src/gtk/collpane.cpp
View File

@ -204,7 +204,7 @@ bool wxCollapsiblePane::Create(wxWindow *parent,
m_parent->DoAddChild( this );
PostCreation(size);
// we should blend into our parent background
const wxColour bg = parent->GetBackgroundColour();
SetBackgroundColour(bg);
@ -285,7 +285,7 @@ GdkWindow *wxCollapsiblePane::GTKGetWindow(wxArrayGdkWindows& windows) const
windows.Add( m_widget->window );
return NULL;
}
}
#endif // wxUSE_COLLPANE && !defined(__WXUNIVERSAL__)

Some files were not shown because too many files have changed in this diff Show More