extra semicolons removed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-10-08 17:10:10 +00:00
parent a7bdad336c
commit e933b5bc36
12 changed files with 25 additions and 25 deletions

View File

@@ -32,7 +32,7 @@
#include "wx/tab.h" #include "wx/tab.h"
#include "wx/listimpl.cpp" #include "wx/listimpl.cpp"
WX_DEFINE_LIST(wxTabLayerList); WX_DEFINE_LIST(wxTabLayerList)
// not defined: use old, square tab implementation (fills in tabs) // not defined: use old, square tab implementation (fills in tabs)
// defined: use new, rounded tab implementation (doesn't colour in tabs) // defined: use new, rounded tab implementation (doesn't colour in tabs)

View File

@@ -126,13 +126,13 @@ void wxBitmapButton::SetBitmapSelected(const wxBitmap& sel)
m_bmpSelectedOriginal = sel; m_bmpSelectedOriginal = sel;
DoSetBitmap(); DoSetBitmap();
}; }
void wxBitmapButton::SetBitmapFocus(const wxBitmap& focus) void wxBitmapButton::SetBitmapFocus(const wxBitmap& focus)
{ {
m_bmpFocus = focus; m_bmpFocus = focus;
// Not used in Motif // Not used in Motif
}; }
void wxBitmapButton::SetBitmapDisabled(const wxBitmap& disabled) void wxBitmapButton::SetBitmapDisabled(const wxBitmap& disabled)
{ {
@@ -140,7 +140,7 @@ void wxBitmapButton::SetBitmapDisabled(const wxBitmap& disabled)
m_bmpDisabledOriginal = disabled; m_bmpDisabledOriginal = disabled;
DoSetBitmap(); DoSetBitmap();
}; }
void wxBitmapButton::DoSetBitmap() void wxBitmapButton::DoSetBitmap()
{ {

View File

@@ -168,8 +168,8 @@ struct wxDataIdToDataObject
#include "wx/listimpl.cpp" #include "wx/listimpl.cpp"
WX_DEFINE_LIST(wxDataObjectList); WX_DEFINE_LIST(wxDataObjectList)
WX_DEFINE_LIST(wxDataIdToDataObjectList); WX_DEFINE_LIST(wxDataIdToDataObjectList)
extern "C" extern "C"
{ {
@@ -231,8 +231,8 @@ bool wxClipboard::SetData( wxDataObject *data )
return AddData( data ); return AddData( data );
} }
wxDECLARE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray ); wxDECLARE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray )
wxDEFINE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray ); wxDEFINE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray )
#if wxCHECK_LESSTIF() #if wxCHECK_LESSTIF()
void wxClipboardCallback( Widget xwidget, int* data_id, void wxClipboardCallback( Widget xwidget, int* data_id,

View File

@@ -43,7 +43,7 @@ public:
WX_DECLARE_LIST(wxXCursor, wxXCursorList); WX_DECLARE_LIST(wxXCursor, wxXCursorList);
#include "wx/listimpl.cpp" #include "wx/listimpl.cpp"
WX_DEFINE_LIST(wxXCursorList); WX_DEFINE_LIST(wxXCursorList)
class WXDLLEXPORT wxCursorRefData: public wxObjectRefData class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
{ {

View File

@@ -54,7 +54,7 @@ wxMemoryDC::wxMemoryDC(void)
SetBrush (* wxWHITE_BRUSH); SetBrush (* wxWHITE_BRUSH);
SetPen (* wxBLACK_PEN); SetPen (* wxBLACK_PEN);
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
}; }
wxMemoryDC::wxMemoryDC( wxDC* dc ) wxMemoryDC::wxMemoryDC( wxDC* dc )
{ {
@@ -80,11 +80,11 @@ wxMemoryDC::wxMemoryDC( wxDC* dc )
SetBrush (* wxWHITE_BRUSH); SetBrush (* wxWHITE_BRUSH);
SetPen (* wxBLACK_PEN); SetPen (* wxBLACK_PEN);
}; }
wxMemoryDC::~wxMemoryDC(void) wxMemoryDC::~wxMemoryDC(void)
{ {
}; }
void wxMemoryDC::SelectObject( const wxBitmap& bitmap ) void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
{ {
@@ -120,7 +120,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
m_ok = false; m_ok = false;
m_pixmap = (WXPixmap) 0; m_pixmap = (WXPixmap) 0;
}; };
}; }
void wxMemoryDC::DoGetSize( int *width, int *height ) const void wxMemoryDC::DoGetSize( int *width, int *height ) const
{ {
@@ -134,6 +134,6 @@ void wxMemoryDC::DoGetSize( int *width, int *height ) const
if (width) (*width) = 0; if (width) (*width) = 0;
if (height) (*height) = 0; if (height) (*height) = 0;
}; };
}; }

View File

@@ -410,7 +410,7 @@ private:
DECLARE_DYNAMIC_CLASS(wxIdlePipeModule) DECLARE_DYNAMIC_CLASS(wxIdlePipeModule)
}; };
IMPLEMENT_DYNAMIC_CLASS(wxIdlePipeModule, wxModule); IMPLEMENT_DYNAMIC_CLASS(wxIdlePipeModule, wxModule)
static void wxInputCallback( XtPointer, int* fd, XtInputId* ) static void wxInputCallback( XtPointer, int* fd, XtInputId* )
{ {

View File

@@ -14,7 +14,7 @@
#include "wx/icon.h" #include "wx/icon.h"
IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap); IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
// ============================================================================ // ============================================================================
// Icons // Icons

View File

@@ -32,7 +32,7 @@
#include "wx/motif/private.h" #include "wx/motif/private.h"
IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl); IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
bool wxStaticText::Create(wxWindow *parent, wxWindowID id, bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
const wxString& label, const wxString& label,

View File

@@ -26,7 +26,7 @@
#include "wx/motif/private.h" #include "wx/motif/private.h"
IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler); IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
WX_DECLARE_VOIDPTR_HASH_MAP(wxTimer*, wxTimerHashMap); WX_DECLARE_VOIDPTR_HASH_MAP(wxTimer*, wxTimerHashMap);

View File

@@ -529,7 +529,7 @@ void wxGetMousePosition( int* x, int* y )
*x = xev.x_root; *x = xev.x_root;
*y = xev.y_root; *y = xev.y_root;
#endif #endif
}; }
// Return true if we have a colour display // Return true if we have a colour display
bool wxColourDisplay() bool wxColourDisplay()

View File

@@ -1303,7 +1303,7 @@ int GrGetPixelColor(GR_SCREEN_INFO* sinfo, GR_PALETTE* palette, GR_PIXELVAL pixe
// Bitmap handlers // Bitmap handlers
// ============================================================================ // ============================================================================
IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase); IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase)
#define M_BMPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData()) #define M_BMPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData())
@@ -1337,7 +1337,7 @@ public:
{ return false; } { return false; }
}; };
IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler); IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
long WXUNUSED(flags), int WXUNUSED(desiredWidth), long WXUNUSED(flags), int WXUNUSED(desiredWidth),
@@ -1451,7 +1451,7 @@ public:
int width, int height, int depth = 1); int width, int height, int depth = 1);
}; };
IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler); IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *bits, bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *bits,
long WXUNUSED(flags), long WXUNUSED(flags),
@@ -1557,7 +1557,7 @@ public:
int width, int height, int depth = 1); int width, int height, int depth = 1);
}; };
IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler); IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler)
bool wxXBMDataHandler::Create( wxBitmap *bitmap, void *bits, bool wxXBMDataHandler::Create( wxBitmap *bitmap, void *bits,
long WXUNUSED(flags), long WXUNUSED(flags),

View File

@@ -58,8 +58,8 @@ public:
#define M_REGIONDATA ((wxRegionRefData *)m_refData) #define M_REGIONDATA ((wxRegionRefData *)m_refData)
#define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData)) #define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData))
IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject); IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject); IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxRegion construction // wxRegion construction