Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not put semicolons after the definition of an inline function.

Browse Source 
Even though most compilers just ignore this, it's just wrong and if you
do get warnings about header files, they can become quite overwhelming.
Forward port of r70163.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2011-12-29 14:42:13 +00:00
parent d0a341b34a
commit 6dd0883d55
66 changed files with 112 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/cocoa/dc.h
View File

@@ -80,10 +80,10 @@ public:
virtual void Clear(); virtual void Clear();
virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; } virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; }
virtual void EndDoc(void) {}; virtual void EndDoc(void) {}
virtual void StartPage(void) {}; virtual void StartPage(void) {}
virtual void EndPage(void) {}; virtual void EndPage(void) {}
virtual void SetFont(const wxFont& font); virtual void SetFont(const wxFont& font);
virtual void SetPen(const wxPen& pen); virtual void SetPen(const wxPen& pen);

4
include/wx/combobox.h
View File

@@ -53,8 +53,8 @@ public:
virtual int GetSelection() const = 0; virtual int GetSelection() const = 0;
virtual void GetSelection(long *from, long *to) const = 0; virtual void GetSelection(long *from, long *to) const = 0;
virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); }; virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); }
virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); }; virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); }
// may return value different from GetSelection() when the combobox // may return value different from GetSelection() when the combobox
// dropdown is shown and the user selected, but not yet accepted, a value // dropdown is shown and the user selected, but not yet accepted, a value

2
include/wx/dataview.h
View File

@@ -1210,7 +1210,7 @@ public:
virtual bool HasDefaultCompare() const virtual bool HasDefaultCompare() const
{ return true; } { return true; }
virtual unsigned int GetColumnCount() const virtual unsigned int GetColumnCount() const
{ return 1; }; { return 1; }
virtual wxString GetColumnType( unsigned int WXUNUSED(col) ) const virtual wxString GetColumnType( unsigned int WXUNUSED(col) ) const
{ return wxT("wxDataViewIconText"); } { return wxT("wxDataViewIconText"); }

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

@@ -130,7 +130,7 @@ public:
// Called when a tab is activated // Called when a tab is activated
virtual void OnTabActivate(int activateId, int deactivateId); virtual void OnTabActivate(int activateId, int deactivateId);
// Allows vetoing // Allows vetoing
virtual bool OnTabPreActivate(int WXUNUSED(activateId), int WXUNUSED(deactivateId) ) { return true; }; virtual bool OnTabPreActivate(int WXUNUSED(activateId), int WXUNUSED(deactivateId) ) { return true; }
// Allows use of application-supplied wxTabControl classes. // Allows use of application-supplied wxTabControl classes.
virtual wxTabControl *OnCreateTabControl(void) { return new wxTabControl(this); } virtual wxTabControl *OnCreateTabControl(void) { return new wxTabControl(this); }

2
include/wx/glcanvas.h
View File

@@ -143,7 +143,7 @@ public:
#ifdef __WXUNIVERSAL__ #ifdef __WXUNIVERSAL__
// resolve the conflict with wxWindowUniv::SetCurrent() // resolve the conflict with wxWindowUniv::SetCurrent()
virtual bool SetCurrent(bool doit) { return wxWindow::SetCurrent(doit); }; virtual bool SetCurrent(bool doit) { return wxWindow::SetCurrent(doit); }
#endif #endif
protected: protected:

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

@@ -94,7 +94,7 @@ public:
#if wxUSE_PALETTE #if wxUSE_PALETTE
wxPalette *GetPalette() const; wxPalette *GetPalette() const;
void SetPalette(const wxPalette& palette); void SetPalette(const wxPalette& palette);
wxPalette *GetColourMap() const { return GetPalette(); }; wxPalette *GetColourMap() const { return GetPalette(); }
#endif // wxUSE_PALETTE #endif // wxUSE_PALETTE
static void InitStandardHandlers(); static void InitStandardHandlers();

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

@@ -23,7 +23,7 @@ public:
virtual ~wxGTKDCImpl(); virtual ~wxGTKDCImpl();
#if wxUSE_PALETTE #if wxUSE_PALETTE
void SetColourMap( const wxPalette& palette ) { SetPalette(palette); }; void SetColourMap( const wxPalette& palette ) { SetPalette(palette); }
#endif // wxUSE_PALETTE #endif // wxUSE_PALETTE
// Resolution in pixels per logical inch // Resolution in pixels per logical inch

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

@@ -88,7 +88,7 @@ public:
Create( parent, id, defaultDirectory, defaultFilename, wildCard, style, pos, size, name ); Create( parent, id, defaultDirectory, defaultFilename, wildCard, style, pos, size, name );
} }
virtual ~wxGtkFileCtrl() {}; virtual ~wxGtkFileCtrl() {}
void Init(); void Init();
bool Create( wxWindow *parent, bool Create( wxWindow *parent,

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

@@ -43,8 +43,8 @@ public:
void SetShadowWidth( int WXUNUSED(w) ) { } void SetShadowWidth( int WXUNUSED(w) ) { }
void SetBezelFace( int WXUNUSED(w) ) { } void SetBezelFace( int WXUNUSED(w) ) { }
int GetShadowWidth() const { return 0; }; int GetShadowWidth() const { return 0; }
int GetBezelFace() const { return 0; }; int GetBezelFace() const { return 0; }
// determinate mode API // determinate mode API
void SetRange( int r ); void SetRange( int r );

2
include/wx/gtk/private/timer.h
View File

@@ -21,7 +21,7 @@
class WXDLLIMPEXP_CORE wxGTKTimerImpl : public wxTimerImpl class WXDLLIMPEXP_CORE wxGTKTimerImpl : public wxTimerImpl
{ {
public: public:
wxGTKTimerImpl(wxTimer* timer) : wxTimerImpl(timer) { m_sourceId = 0; }; wxGTKTimerImpl(wxTimer* timer) : wxTimerImpl(timer) { m_sourceId = 0; }
virtual bool Start( int millisecs = -1, bool oneShot = false ); virtual bool Start( int millisecs = -1, bool oneShot = false );
virtual void Stop(); virtual void Stop();

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

@@ -55,7 +55,7 @@ public:
virtual void ShowWithoutActivating(); virtual void ShowWithoutActivating();
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
virtual bool IsFullScreen() const { return m_fsIsShowing; }; virtual bool IsFullScreen() const { return m_fsIsShowing; }
virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);

2
include/wx/gtk1/bitmap.h
View File

@@ -105,7 +105,7 @@ public:
#if wxUSE_PALETTE #if wxUSE_PALETTE
wxPalette *GetPalette() const; wxPalette *GetPalette() const;
void SetPalette(const wxPalette& palette); void SetPalette(const wxPalette& palette);
wxPalette *GetColourMap() const { return GetPalette(); }; wxPalette *GetColourMap() const { return GetPalette(); }
#endif // wxUSE_PALETTE #endif // wxUSE_PALETTE
static void InitStandardHandlers(); static void InitStandardHandlers();

2
include/wx/gtk1/dc.h
View File

@@ -23,7 +23,7 @@ public:
virtual ~wxGTKDCImpl() { } virtual ~wxGTKDCImpl() { }
#if wxUSE_PALETTE #if wxUSE_PALETTE
void SetColourMap( const wxPalette& palette ) { SetPalette(palette); }; void SetColourMap( const wxPalette& palette ) { SetPalette(palette); }
#endif // wxUSE_PALETTE #endif // wxUSE_PALETTE
// Resolution in pixels per logical inch // Resolution in pixels per logical inch

4
include/wx/gtk1/gauge.h
View File

@@ -45,8 +45,8 @@ public:
void SetBezelFace( int WXUNUSED(w) ) { } void SetBezelFace( int WXUNUSED(w) ) { }
void SetRange( int r ); void SetRange( int r );
void SetValue( int pos ); void SetValue( int pos );
int GetShadowWidth() const { return 0; }; int GetShadowWidth() const { return 0; }
int GetBezelFace() const { return 0; }; int GetBezelFace() const { return 0; }
int GetRange() const; int GetRange() const;
int GetValue() const; int GetValue() const;

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

@@ -30,7 +30,7 @@ public:
virtual ~wxMessageDialog(); virtual ~wxMessageDialog();
int ShowModal(); int ShowModal();
virtual bool Show( bool WXUNUSED(show) = true ) { return false; }; virtual bool Show( bool WXUNUSED(show) = true ) { return false; }
protected: protected:
// implement some base class methods to do nothing to avoid asserts and // implement some base class methods to do nothing to avoid asserts and

2
include/wx/gtk1/toplevel.h
View File

@@ -51,7 +51,7 @@ public:
virtual void Restore(); virtual void Restore();
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
virtual bool IsFullScreen() const { return m_fsIsShowing; }; virtual bool IsFullScreen() const { return m_fsIsShowing; }
virtual bool SetShape(const wxRegion& region); virtual bool SetShape(const wxRegion& region);

4
include/wx/html/webkit.h
View File

@@ -32,7 +32,7 @@ class WXDLLIMPEXP_CORE wxWebKitCtrl : public wxControl
public: public:
DECLARE_DYNAMIC_CLASS(wxWebKitCtrl) DECLARE_DYNAMIC_CLASS(wxWebKitCtrl)
wxWebKitCtrl() {}; wxWebKitCtrl() {}
wxWebKitCtrl(wxWindow *parent, wxWebKitCtrl(wxWindow *parent,
wxWindowID winID, wxWindowID winID,
const wxString& strURL, const wxString& strURL,
@@ -42,7 +42,7 @@ public:
const wxString& name = wxWebKitCtrlNameStr) const wxString& name = wxWebKitCtrlNameStr)
{ {
Create(parent, winID, strURL, pos, size, style, validator, name); Create(parent, winID, strURL, pos, size, style, validator, name);
}; }
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID winID, wxWindowID winID,
const wxString& strURL, const wxString& strURL,

2
include/wx/list.h
View File

@@ -1198,7 +1198,7 @@ class WXDLLIMPEXP_BASE wxList : public wxObjectList
{ {
public: public:
#if defined(wxWARN_COMPAT_LIST_USE) && !wxUSE_STD_CONTAINERS #if defined(wxWARN_COMPAT_LIST_USE) && !wxUSE_STD_CONTAINERS
wxList() { }; wxList() { }
wxDEPRECATED( wxList(int key_type) ); wxDEPRECATED( wxList(int key_type) );
#elif !wxUSE_STD_CONTAINERS #elif !wxUSE_STD_CONTAINERS
wxList(int key_type = wxKEY_NONE); wxList(int key_type = wxKEY_NONE);

2
include/wx/mdi.h
View File

@@ -81,7 +81,7 @@ public:
#if wxUSE_MENUS #if wxUSE_MENUS
// return the pointer to the current window menu or NULL if we don't have // return the pointer to the current window menu or NULL if we don't have
// because of wxFRAME_NO_WINDOW_MENU style // because of wxFRAME_NO_WINDOW_MENU style
wxMenu* GetWindowMenu() const { return m_windowMenu; }; wxMenu* GetWindowMenu() const { return m_windowMenu; }
// use the given menu instead of the default window menu // use the given menu instead of the default window menu
// //

4
include/wx/motif/colour.h
View File

@@ -38,8 +38,8 @@ public:
unsigned char Green() const { return m_green; } unsigned char Green() const { return m_green; }
unsigned char Blue() const { return m_blue; } unsigned char Blue() const { return m_blue; }
WXPixel GetPixel() const { return m_pixel; }; WXPixel GetPixel() const { return m_pixel; }
void SetPixel(WXPixel pixel) { m_pixel = pixel; m_isInit = true; }; void SetPixel(WXPixel pixel) { m_pixel = pixel; m_isInit = true; }
inline bool operator == (const wxColour& colour) const { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); } inline bool operator == (const wxColour& colour) const { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); }

4
include/wx/motif/combobox.h
View File

@@ -106,8 +106,8 @@ public:
WXWidget GetMainWidget() const { return m_mainWidget; } WXWidget GetMainWidget() const { return m_mainWidget; }
//Copied from wxComboBoxBase because for wxMOTIF wxComboBox does not inherit from it. //Copied from wxComboBoxBase because for wxMOTIF wxComboBox does not inherit from it.
virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); }; virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); }
virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); }; virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); }
protected: protected:
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const;

6
include/wx/motif/dnd.h
View File

@@ -63,7 +63,7 @@ class WXDLLIMPEXP_CORE wxTextDropTarget: public wxDropTarget
{ {
public: public:
wxTextDropTarget() {}; wxTextDropTarget() {}
virtual bool OnDrop( long x, long y, const void *data, size_t size ); virtual bool OnDrop( long x, long y, const void *data, size_t size );
virtual bool OnDropText( long x, long y, const char *psz ); virtual bool OnDropText( long x, long y, const char *psz );
@@ -111,7 +111,7 @@ class WXDLLIMPEXP_CORE wxFileDropTarget: public wxDropTarget
{ {
public: public:
wxFileDropTarget() {}; wxFileDropTarget() {}
virtual bool OnDrop( long x, long y, const void *data, size_t size ); virtual bool OnDrop( long x, long y, const void *data, size_t size );
virtual bool OnDropFiles( long x, long y, virtual bool OnDropFiles( long x, long y,
@@ -148,7 +148,7 @@ public:
void SetData( wxDataObject &data ); void SetData( wxDataObject &data );
wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly); wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return true; }; virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return true; }
// implementation // implementation
#if 0 #if 0

2
include/wx/motif/spinbutt.h
View File

@@ -53,7 +53,7 @@ public:
// Implementation // Implementation
virtual void Command(wxCommandEvent& event) virtual void Command(wxCommandEvent& event)
{ (void)ProcessCommand(event); }; { (void)ProcessCommand(event); }
virtual void ChangeFont(bool keepOriginalSize = true); virtual void ChangeFont(bool keepOriginalSize = true);
virtual void ChangeBackgroundColour(); virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour(); virtual void ChangeForegroundColour();

2
include/wx/msw/private/timer.h
View File

@@ -19,7 +19,7 @@
class WXDLLIMPEXP_BASE wxMSWTimerImpl : public wxTimerImpl class WXDLLIMPEXP_BASE wxMSWTimerImpl : public wxTimerImpl
{ {
public: public:
wxMSWTimerImpl(wxTimer *timer) : wxTimerImpl(timer) { m_id = 0; }; wxMSWTimerImpl(wxTimer *timer) : wxTimerImpl(timer) { m_id = 0; }
virtual bool Start(int milliseconds = -1, bool oneShot = false); virtual bool Start(int milliseconds = -1, bool oneShot = false);
virtual void Stop(); virtual void Stop();

2
include/wx/msw/webview_ie.h
View File

@@ -305,7 +305,7 @@ protected:
public: public:
VirtualProtocol(wxSharedPtr<wxWebViewHandler> handler); VirtualProtocol(wxSharedPtr<wxWebViewHandler> handler);
~VirtualProtocol() {}; ~VirtualProtocol() {}
//IUnknown //IUnknown
DECLARE_IUNKNOWN_METHODS; DECLARE_IUNKNOWN_METHODS;

2
include/wx/os2/checkbox.h
View File

@@ -110,7 +110,7 @@ class WXDLLIMPEXP_CORE wxBitmapCheckBox: public wxCheckBox
private: private:
virtual void SetLabel(const wxString& rsString) virtual void SetLabel(const wxString& rsString)
{ wxCheckBox::SetLabel(rsString); }; { wxCheckBox::SetLabel(rsString); }
DECLARE_DYNAMIC_CLASS(wxBitmapCheckBox) DECLARE_DYNAMIC_CLASS(wxBitmapCheckBox)
}; };
#endif #endif

2
include/wx/os2/colour.h
View File

@@ -49,7 +49,7 @@ public:
bool operator != (const wxColour& rColour) const { return !(*this == rColour); } bool operator != (const wxColour& rColour) const { return !(*this == rColour); }
WXCOLORREF GetPixel(void) const { return m_vPixel; }; WXCOLORREF GetPixel(void) const { return m_vPixel; }
private: private:

4
include/wx/os2/control.h
View File

@@ -63,8 +63,8 @@ public:
// //
// For ownerdraw items // For ownerdraw items
// //
virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return false; }; virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return false; }
virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return 0L; }; virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return 0L; }
wxArrayLong& GetSubcontrols() { return m_aSubControls; } wxArrayLong& GetSubcontrols() { return m_aSubControls; }
void OnEraseBackground(wxEraseEvent& rEvent); void OnEraseBackground(wxEraseEvent& rEvent);

4
include/wx/os2/frame.h
View File

@@ -93,9 +93,9 @@ public:
// TODO: should this go into a wxFrameworkSettings class perhaps? // TODO: should this go into a wxFrameworkSettings class perhaps?
static void UseNativeStatusBar(bool bUseNative) static void UseNativeStatusBar(bool bUseNative)
{ m_bUseNativeStatusBar = bUseNative; }; { m_bUseNativeStatusBar = bUseNative; }
static bool UsesNativeStatusBar() static bool UsesNativeStatusBar()
{ return m_bUseNativeStatusBar; }; { return m_bUseNativeStatusBar; }
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
WXHMENU GetWinMenu() const { return m_hMenu; } WXHMENU GetWinMenu() const { return m_hMenu; }

2
include/wx/os2/gauge.h
View File

@@ -61,7 +61,7 @@ public:
void SetValue(int nPos); void SetValue(int nPos);
inline virtual bool AcceptsFocus(void) const { return FALSE; } inline virtual bool AcceptsFocus(void) const { return FALSE; }
inline virtual void Command(wxCommandEvent& WXUNUSED(rEvent)) {}; inline virtual void Command(wxCommandEvent& WXUNUSED(rEvent)) {}
protected: protected:
int m_nRangeMax; int m_nRangeMax;

2
include/wx/os2/gdiimage.h
View File

@@ -54,7 +54,7 @@ public:
{ m_nWidth = nW; m_nHeight = nH; } { m_nWidth = nW; m_nHeight = nH; }
// free the ressources we allocated // free the ressources we allocated
virtual void Free() { }; virtual void Free() { }
// for compatibility, the member fields are public // for compatibility, the member fields are public

4
include/wx/os2/icon.h
View File

@@ -25,7 +25,7 @@
class WXDLLIMPEXP_CORE wxIconRefData: public wxIconRefDataBase class WXDLLIMPEXP_CORE wxIconRefData: public wxIconRefDataBase
{ {
public: public:
wxIconRefData() { }; wxIconRefData() { }
virtual ~wxIconRefData() { Free(); } virtual ~wxIconRefData() { Free(); }
virtual void Free(); virtual void Free();
@@ -70,7 +70,7 @@ public:
inline void SetHICON(WXHICON hIcon) { SetHandle((WXHANDLE)hIcon); } inline void SetHICON(WXHICON hIcon) { SetHandle((WXHANDLE)hIcon); }
inline WXHICON GetHICON() const { return (WXHICON)GetHandle(); } inline WXHICON GetHICON() const { return (WXHICON)GetHandle(); }
inline bool IsXpm(void) const { return m_bIsXpm; }; inline bool IsXpm(void) const { return m_bIsXpm; }
inline const wxBitmap& GetXpmSrc(void) const { return m_vXpmSrc; } inline const wxBitmap& GetXpmSrc(void) const { return m_vXpmSrc; }
void CopyFromBitmap(const wxBitmap& rBmp); void CopyFromBitmap(const wxBitmap& rBmp);

10
include/wx/os2/iniconf.h
View File

@@ -107,15 +107,15 @@ private:
m_strPath; // the rest of the path (no trailing '_'!) m_strPath; // the rest of the path (no trailing '_'!)
// Virtual function hiding // Virtual function hiding
virtual bool Read(const wxString& key, bool* val) const virtual bool Read(const wxString& key, bool* val) const
{ return(wxConfigBase::Read(key, val));}; { return(wxConfigBase::Read(key, val));}
virtual bool Read(const wxString& key, bool* val, bool defVal) const virtual bool Read(const wxString& key, bool* val, bool defVal) const
{ return(wxConfigBase::Read(key, val, defVal));}; { return(wxConfigBase::Read(key, val, defVal));}
virtual bool Write(const wxString& key, double value) virtual bool Write(const wxString& key, double value)
{ return(wxConfigBase::Write(key, value));}; { return(wxConfigBase::Write(key, value));}
virtual bool Write(const wxString& key, bool value) virtual bool Write(const wxString& key, bool value)
{ return(wxConfigBase::Write(key, value));}; { return(wxConfigBase::Write(key, value));}
virtual bool Write(const wxString& key, const char* value) virtual bool Write(const wxString& key, const char* value)
{ return(wxConfigBase::Write(key, value));}; { return(wxConfigBase::Write(key, value));}
}; };
#endif //_INICONF_H #endif //_INICONF_H

2
include/wx/os2/joystick.h
View File

@@ -22,7 +22,7 @@ class WXDLLIMPEXP_ADV wxJoystick: public wxObject
* Public interface * Public interface
*/ */
wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; }; wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; }
// Attributes // Attributes
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////

2
include/wx/os2/metafile.h
View File

@@ -172,7 +172,7 @@ class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObject
{ {
public: public:
// ctors // ctors
wxMetafileDataObject() { m_width = 0; m_height = 0; }; wxMetafileDataObject() { m_width = 0; m_height = 0; }
wxMetafileDataObject(const wxMetafile& metafile, int width = 0,int height = 0) wxMetafileDataObject(const wxMetafile& metafile, int width = 0,int height = 0)
:m_metafile(metafile) :m_metafile(metafile)
,m_width(width) ,m_width(width)

2
include/wx/os2/pnghand.h
View File

@@ -21,7 +21,7 @@ public:
m_sName = "PNG bitmap file"; m_sName = "PNG bitmap file";
m_sExtension = "bmp"; m_sExtension = "bmp";
m_lType = wxBITMAP_TYPE_PNG; m_lType = wxBITMAP_TYPE_PNG;
}; }
virtual bool LoadFile( wxBitmap* pBitmap virtual bool LoadFile( wxBitmap* pBitmap
,const wxString& rName ,const wxString& rName

8
include/wx/os2/pngread.h
View File

@@ -62,10 +62,10 @@ public:
bool ReadFile( wxChar* ImageFileName=0 ); bool ReadFile( wxChar* ImageFileName=0 );
bool SaveFile( wxChar* ImageFileName=0 ); bool SaveFile( wxChar* ImageFileName=0 );
bool SaveXPM(wxChar *filename, wxChar *name = 0); bool SaveXPM(wxChar *filename, wxChar *name = 0);
int GetWidth( void ) const { return Width; }; int GetWidth( void ) const { return Width; }
int GetHeight( void ) const { return Height; }; int GetHeight( void ) const { return Height; }
int GetDepth( void ) const { return Depth; }; int GetDepth( void ) const { return Depth; }
int GetColorType( void ) const { return ColorType; }; int GetColorType( void ) const { return ColorType; }
int GetIndex(int x, int y); int GetIndex(int x, int y);
bool GetRGB(int x, int y, byte* r, byte* g, byte* b); bool GetRGB(int x, int y, byte* r, byte* g, byte* b);

2
include/wx/os2/radiobox.h
View File

@@ -150,7 +150,7 @@ public:
inline void SetButtonFont(const wxFont& rFont) { SetFont(rFont); } inline void SetButtonFont(const wxFont& rFont) { SetFont(rFont); }
void SetFocus(void); void SetFocus(void);
virtual bool SetFont(const wxFont& rFont); virtual bool SetFont(const wxFont& rFont);
inline void SetLabelFont(const wxFont& WXUNUSED(font)) {}; inline void SetLabelFont(const wxFont& WXUNUSED(font)) {}
virtual void SetSelection(int nIndex); virtual void SetSelection(int nIndex);
virtual void SetString(unsigned int nNum, const wxString& rsLabel); virtual void SetString(unsigned int nNum, const wxString& rsLabel);
virtual bool SetStringSelection(const wxString& rsStr); virtual bool SetStringSelection(const wxString& rsStr);

2
include/wx/os2/sound.h
View File

@@ -29,7 +29,7 @@ public:
// Create from data // Create from data
bool Create(size_t size, const void* data); bool Create(size_t size, const void* data);
bool IsOk() const { return (m_waveData ? TRUE : FALSE); }; bool IsOk() const { return (m_waveData ? TRUE : FALSE); }
protected: protected:
bool Free(); bool Free();

2
include/wx/os2/statbmp.h
View File

@@ -43,7 +43,7 @@ class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase
inline virtual ~wxStaticBitmap() { Free(); } inline virtual ~wxStaticBitmap() { Free(); }
virtual void SetIcon(const wxIcon& rIcon) { SetImage(rIcon); } virtual void SetIcon(const wxIcon& rIcon) { SetImage(rIcon); }
virtual void SetBitmap(const wxBitmap& rBitmap) { SetImage(rBitmap); }; virtual void SetBitmap(const wxBitmap& rBitmap) { SetImage(rBitmap); }
// assert failure is provoked by an attempt to get an icon from bitmap or // assert failure is provoked by an attempt to get an icon from bitmap or
// vice versa // vice versa

2
include/wx/os2/treectrl.h
View File

@@ -586,7 +586,7 @@ private:
,int nImage ,int nImage
,int nImageSel ,int nImageSel
); );
void DeleteTextCtrl() { }; void DeleteTextCtrl() { }
// //
// support for additional item images which we implement using // support for additional item images which we implement using

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

@@ -118,7 +118,7 @@ public:
); );
inline HWND GetScrollBarHorz(void) const {return m_hWndScrollBarHorz;} inline HWND GetScrollBarHorz(void) const {return m_hWndScrollBarHorz;}
inline HWND GetScrollBarVert(void) const {return m_hWndScrollBarVert;}; inline HWND GetScrollBarVert(void) const {return m_hWndScrollBarVert;}
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
virtual void SetDropTarget(wxDropTarget* pDropTarget); virtual void SetDropTarget(wxDropTarget* pDropTarget);
#endif // wxUSE_DRAG_AND_DROP #endif // wxUSE_DRAG_AND_DROP
@@ -182,7 +182,7 @@ public:
); );
// PM only: true if this control is part of the main control // PM only: true if this control is part of the main control
virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; }; virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; }
// translate wxWidgets style flags for this control into the PM style // translate wxWidgets style flags for this control into the PM style
// and optional extended style for the corresponding native control // and optional extended style for the corresponding native control

4
include/wx/osx/carbon/statbmp.h
View File

@@ -39,8 +39,8 @@ class WXDLLIMPEXP_CORE wxStaticBitmap: public wxStaticBitmapBase
virtual void SetBitmap(const wxBitmap& bitmap); virtual void SetBitmap(const wxBitmap& bitmap);
virtual void Command(wxCommandEvent& WXUNUSED(event)) {}; virtual void Command(wxCommandEvent& WXUNUSED(event)) {}
virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}; virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}
void OnPaint( wxPaintEvent &event ) ; void OnPaint( wxPaintEvent &event ) ;
wxBitmap GetBitmap() const { return m_bitmap; } wxBitmap GetBitmap() const { return m_bitmap; }

6
include/wx/osx/core/colour.h
View File

@@ -42,10 +42,10 @@ public:
bool operator != (const wxColour& colour) const { return !(*this == colour); } bool operator != (const wxColour& colour) const { return !(*this == colour); }
CGColorRef GetPixel() const { return m_cgColour; }; CGColorRef GetPixel() const { return m_cgColour; }
CGColorRef GetCGColor() const { return m_cgColour; }; CGColorRef GetCGColor() const { return m_cgColour; }
CGColorRef CreateCGColor() const { return wxCFRetain( (CGColorRef)m_cgColour ); }; CGColorRef CreateCGColor() const { return wxCFRetain( (CGColorRef)m_cgColour ); }
#if wxOSX_USE_COCOA_OR_CARBON #if wxOSX_USE_COCOA_OR_CARBON
void GetRGBColor( RGBColor *col ) const; void GetRGBColor( RGBColor *col ) const;

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

@@ -680,10 +680,10 @@ public :
virtual ~wxComboWidgetImpl() {} virtual ~wxComboWidgetImpl() {}
virtual int GetSelectedItem() const { return -1; }; virtual int GetSelectedItem() const { return -1; }
virtual void SetSelectedItem(int WXUNUSED(item)) {}; virtual void SetSelectedItem(int WXUNUSED(item)) {}
virtual int GetNumberOfItems() const { return -1; }; virtual int GetNumberOfItems() const { return -1; }
virtual void InsertItem(int WXUNUSED(pos), const wxString& WXUNUSED(item)) {} virtual void InsertItem(int WXUNUSED(pos), const wxString& WXUNUSED(item)) {}

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

@@ -22,7 +22,7 @@ class WXDLLIMPEXP_ADV wxJoystick: public wxObject
* Public interface * Public interface
*/ */
wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; }; wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; }
// Attributes // Attributes
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////

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

@@ -314,10 +314,10 @@ class WXDLLIMPEXP_CORE wxListCtrl: public wxControl
bool Update(long item); bool Update(long item);
*/ */
void Command(wxCommandEvent& event) { ProcessCommand(event); }; void Command(wxCommandEvent& event) { ProcessCommand(event); }
wxListCtrlCompare GetCompareFunc() { return m_compareFunc; }; wxListCtrlCompare GetCompareFunc() { return m_compareFunc; }
wxIntPtr GetCompareFuncData() { return m_compareFuncData; }; wxIntPtr GetCompareFuncData() { return m_compareFuncData; }
// public overrides needed for pimpl approach // public overrides needed for pimpl approach

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

@@ -145,7 +145,7 @@ class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObjectSimple
public: public:
// ctors // ctors
wxMetafileDataObject() wxMetafileDataObject()
: wxDataObjectSimple(wxDF_METAFILE) { }; : wxDataObjectSimple(wxDF_METAFILE) { }
wxMetafileDataObject(const wxMetafile& metafile) wxMetafileDataObject(const wxMetafile& metafile)
: wxDataObjectSimple(wxDF_METAFILE), m_metafile(metafile) { } : wxDataObjectSimple(wxDF_METAFILE), m_metafile(metafile) { }

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

@@ -25,7 +25,7 @@ public:
SetName(wxT("PNG bitmap file")); SetName(wxT("PNG bitmap file"));
SetExtension(wxT("bmp")); SetExtension(wxT("bmp"));
SetType(wxBITMAP_TYPE_PNG); SetType(wxBITMAP_TYPE_PNG);
}; }
virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth, int desiredHeight); int desiredWidth, int desiredHeight);

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

@@ -61,10 +61,10 @@ public:
bool ReadFile( char* ImageFileName=0 ); bool ReadFile( char* ImageFileName=0 );
bool SaveFile( char* ImageFileName=0 ); bool SaveFile( char* ImageFileName=0 );
bool SaveXPM(char *filename, char *name = 0); bool SaveXPM(char *filename, char *name = 0);
int GetWidth( void ) const { return Width; }; int GetWidth( void ) const { return Width; }
int GetHeight( void ) const { return Height; }; int GetHeight( void ) const { return Height; }
int GetDepth( void ) const { return Depth; }; int GetDepth( void ) const { return Depth; }
int GetColorType( void ) const { return ColorType; }; int GetColorType( void ) const { return ColorType; }
int GetIndex(int x, int y); int GetIndex(int x, int y);
bool GetRGB(int x, int y, byte* r, byte* g, byte* b); bool GetRGB(int x, int y, byte* r, byte* g, byte* b);

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

@@ -38,8 +38,8 @@ class WXDLLIMPEXP_CORE wxStaticBox: public wxControl
long style = 0, long style = 0,
const wxString& name = wxStaticBoxNameStr); const wxString& name = wxStaticBoxNameStr);
virtual void Command(wxCommandEvent& WXUNUSED(event)) {}; virtual void Command(wxCommandEvent& WXUNUSED(event)) {}
virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}; virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}
virtual void GetBordersForSizer(int *borderTop, int *borderOther) const; virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;

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

@@ -225,7 +225,7 @@ public:
bool SortChildren(long item); bool SortChildren(long item);
bool EnsureVisible(long item); bool EnsureVisible(long item);
void Command(wxCommandEvent& event) { ProcessCommand(event); }; void Command(wxCommandEvent& event) { ProcessCommand(event); }
protected: protected:
wxTextCtrl* m_textCtrl; wxTextCtrl* m_textCtrl;

2
include/wx/palmos/glcanvas.h
View File

@@ -93,7 +93,7 @@ public:
void SetCurrent(); void SetCurrent();
#ifdef __WXUNIVERSAL__ #ifdef __WXUNIVERSAL__
virtual bool SetCurrent(bool doit) { return wxWindow::SetCurrent(doit); }; virtual bool SetCurrent(bool doit) { return wxWindow::SetCurrent(doit); }
#endif #endif
void SetColour(const wxChar *colour); void SetColour(const wxChar *colour);

2
include/wx/palmos/mdi.h
View File

@@ -62,7 +62,7 @@ public:
virtual wxMDIClientWindow *OnCreateClient(void); virtual wxMDIClientWindow *OnCreateClient(void);
// MDI windows menu // MDI windows menu
wxMenu* GetWindowMenu() const { return m_windowMenu; }; wxMenu* GetWindowMenu() const { return m_windowMenu; }
void SetWindowMenu(wxMenu* menu) ; void SetWindowMenu(wxMenu* menu) ;
// MDI operations // MDI operations

16
include/wx/palmos/pen.h
View File

@@ -104,20 +104,20 @@ public:
void SetJoin(wxPenJoin join); void SetJoin(wxPenJoin join);
void SetCap(wxPenCap cap); void SetCap(wxPenCap cap);
wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); }; wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); }
int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); }; int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); }
wxPenStyle GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); }; wxPenStyle GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); }
wxPenJoin GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); }; wxPenJoin GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); }
wxPenCap GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); }; wxPenCap GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); }
int GetDashes(wxDash **ptr) const int GetDashes(wxDash **ptr) const
{ {
*ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : NULL); *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : NULL);
return (M_PENDATA ? M_PENDATA->m_nbDash : 0); return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
} }
wxDash* GetDash() const { return (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : NULL); }; wxDash* GetDash() const { return (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : NULL); }
inline int GetDashCount() const { return (M_PENDATA ? M_PENDATA->m_nbDash : 0); }; inline int GetDashCount() const { return (M_PENDATA ? M_PENDATA->m_nbDash : 0); }
inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : NULL); }; inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : NULL); }
// Internal // Internal
bool RealizeResource(); bool RealizeResource();

2
include/wx/palmos/radiobox.h
View File

@@ -120,7 +120,7 @@ public:
virtual wxPoint GetClientAreaOrigin() const; virtual wxPoint GetClientAreaOrigin() const;
void SetFocus(); void SetFocus();
void SetLabelFont(const wxFont& WXUNUSED(font)) {}; void SetLabelFont(const wxFont& WXUNUSED(font)) {}
void SetButtonFont(const wxFont& font) { SetFont(font); } void SetButtonFont(const wxFont& font) { SetFont(font); }
virtual void Refresh( bool eraseBackground = true, virtual void Refresh( bool eraseBackground = true,

2
include/wx/palmos/sound.h
View File

@@ -30,7 +30,7 @@ public:
// Create from data // Create from data
bool Create(size_t size, const void* data); bool Create(size_t size, const void* data);
bool IsOk() const { return (m_waveData ? true : false); }; bool IsOk() const { return (m_waveData ? true : false); }
static void Stop(); static void Stop();

2
include/wx/palmos/window.h
View File

@@ -139,7 +139,7 @@ public:
wxWindow *FindItemByWinHandle(WXWINHANDLE handle, bool controlOnly = false) const; wxWindow *FindItemByWinHandle(WXWINHANDLE handle, bool controlOnly = false) const;
// Palm only: true if this control is part of the main control // Palm only: true if this control is part of the main control
virtual bool ContainsWinHandle(WXWINHANDLE WXUNUSED(handle)) const { return false; }; virtual bool ContainsWinHandle(WXWINHANDLE WXUNUSED(handle)) const { return false; }
// translate wxWidgets style flags for this control into the Windows style // translate wxWidgets style flags for this control into the Windows style
// and optional extended style for the corresponding native control // and optional extended style for the corresponding native control

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

@@ -966,7 +966,7 @@ public:
} }
/** Gets a unsigned number identifying this list. */ /** Gets a unsigned number identifying this list. */
wxPGChoicesId GetId() const { return (wxPGChoicesId) m_data; }; wxPGChoicesId GetId() const { return (wxPGChoicesId) m_data; }
const wxString& GetLabel( unsigned int ind ) const const wxString& GetLabel( unsigned int ind ) const
{ {

5
include/wx/rawbmp.h
View File

@@ -172,6 +172,11 @@ typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxImagePixelFormat;
// Under GTK+ 2.X we use GdkPixbuf, which is standard RGB or RGBA // Under GTK+ 2.X we use GdkPixbuf, which is standard RGB or RGBA
typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat; typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat;
#define wxPIXEL_FORMAT_ALPHA 3
#elif defined(__WXPM__)
// Under PM, we can use standard RGB or RGBA
typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat;
#define wxPIXEL_FORMAT_ALPHA 3 #define wxPIXEL_FORMAT_ALPHA 3
#elif defined(__WXDFB__) #elif defined(__WXDFB__)
// Under DirectFB, RGB components are reversed, they're in BGR order // Under DirectFB, RGB components are reversed, they're in BGR order

2
include/wx/richmsgdlg.h
View File

@@ -45,7 +45,7 @@ public:
wxString GetDetailedText() const { return m_detailedText; } wxString GetDetailedText() const { return m_detailedText; }
virtual bool IsCheckBoxChecked() const { return m_checkBoxValue; }; virtual bool IsCheckBoxChecked() const { return m_checkBoxValue; }
protected: protected:
const wxString m_detailsExpanderCollapsedLabel; const wxString m_detailsExpanderCollapsedLabel;

2
include/wx/taskbar.h
View File

@@ -32,7 +32,7 @@ public:
#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) #if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__)
static bool IsAvailable(); static bool IsAvailable();
#else #else
static bool IsAvailable() { return true; }; static bool IsAvailable() { return true; }
#endif #endif
// Operations: // Operations:

2
include/wx/univ/anybutton.h
View File

@@ -20,7 +20,7 @@ class WXDLLIMPEXP_CORE wxAnyButton : public wxAnyButtonBase
public: public:
wxAnyButton() {} wxAnyButton() {}
virtual ~wxAnyButton() {}; virtual ~wxAnyButton() {}
protected: protected:
// choose the default border for this window // choose the default border for this window

2
include/wx/x11/bitmap.h
View File

@@ -117,7 +117,7 @@ public:
wxPalette *GetPalette() const; wxPalette *GetPalette() const;
wxPalette *GetColourMap() const wxPalette *GetColourMap() const
{ return GetPalette(); }; { return GetPalette(); }
virtual void SetPalette(const wxPalette& palette); virtual void SetPalette(const wxPalette& palette);
// implementation // implementation

6
include/wx/x11/dnd.h
View File

@@ -63,7 +63,7 @@ class WXDLLIMPEXP_CORE wxTextDropTarget: public wxDropTarget
{ {
public: public:
wxTextDropTarget() {}; wxTextDropTarget() {}
virtual bool OnDrop( long x, long y, const void *data, size_t size ); virtual bool OnDrop( long x, long y, const void *data, size_t size );
virtual bool OnDropText( long x, long y, const char *psz ); virtual bool OnDropText( long x, long y, const char *psz );
@@ -111,7 +111,7 @@ class WXDLLIMPEXP_CORE wxFileDropTarget: public wxDropTarget
{ {
public: public:
wxFileDropTarget() {}; wxFileDropTarget() {}
virtual bool OnDrop( long x, long y, const void *data, size_t size ); virtual bool OnDrop( long x, long y, const void *data, size_t size );
virtual bool OnDropFiles( long x, long y, virtual bool OnDropFiles( long x, long y,
@@ -148,7 +148,7 @@ public:
void SetData( wxDataObject &data ); void SetData( wxDataObject &data );
wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly); wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; }; virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; }
// implementation // implementation
#if 0 #if 0

2
include/wx/x11/joystick.h
View File

@@ -22,7 +22,7 @@ public:
* Public interface * Public interface
*/ */
wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; }; wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; }
// Attributes // Attributes
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////