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:
parent
a7bdad336c
commit
e933b5bc36
@ -32,7 +32,7 @@
|
||||
#include "wx/tab.h"
|
||||
#include "wx/listimpl.cpp"
|
||||
|
||||
WX_DEFINE_LIST(wxTabLayerList);
|
||||
WX_DEFINE_LIST(wxTabLayerList)
|
||||
|
||||
// not defined: use old, square tab implementation (fills in tabs)
|
||||
// defined: use new, rounded tab implementation (doesn't colour in tabs)
|
||||
|
@ -126,13 +126,13 @@ void wxBitmapButton::SetBitmapSelected(const wxBitmap& sel)
|
||||
m_bmpSelectedOriginal = sel;
|
||||
|
||||
DoSetBitmap();
|
||||
};
|
||||
}
|
||||
|
||||
void wxBitmapButton::SetBitmapFocus(const wxBitmap& focus)
|
||||
{
|
||||
m_bmpFocus = focus;
|
||||
// Not used in Motif
|
||||
};
|
||||
}
|
||||
|
||||
void wxBitmapButton::SetBitmapDisabled(const wxBitmap& disabled)
|
||||
{
|
||||
@ -140,7 +140,7 @@ void wxBitmapButton::SetBitmapDisabled(const wxBitmap& disabled)
|
||||
m_bmpDisabledOriginal = disabled;
|
||||
|
||||
DoSetBitmap();
|
||||
};
|
||||
}
|
||||
|
||||
void wxBitmapButton::DoSetBitmap()
|
||||
{
|
||||
|
@ -168,8 +168,8 @@ struct wxDataIdToDataObject
|
||||
|
||||
#include "wx/listimpl.cpp"
|
||||
|
||||
WX_DEFINE_LIST(wxDataObjectList);
|
||||
WX_DEFINE_LIST(wxDataIdToDataObjectList);
|
||||
WX_DEFINE_LIST(wxDataObjectList)
|
||||
WX_DEFINE_LIST(wxDataIdToDataObjectList)
|
||||
|
||||
extern "C"
|
||||
{
|
||||
@ -231,8 +231,8 @@ bool wxClipboard::SetData( wxDataObject *data )
|
||||
return AddData( data );
|
||||
}
|
||||
|
||||
wxDECLARE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray );
|
||||
wxDEFINE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray );
|
||||
wxDECLARE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray )
|
||||
wxDEFINE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray )
|
||||
|
||||
#if wxCHECK_LESSTIF()
|
||||
void wxClipboardCallback( Widget xwidget, int* data_id,
|
||||
|
@ -43,7 +43,7 @@ public:
|
||||
|
||||
WX_DECLARE_LIST(wxXCursor, wxXCursorList);
|
||||
#include "wx/listimpl.cpp"
|
||||
WX_DEFINE_LIST(wxXCursorList);
|
||||
WX_DEFINE_LIST(wxXCursorList)
|
||||
|
||||
class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
|
||||
{
|
||||
|
@ -54,7 +54,7 @@ wxMemoryDC::wxMemoryDC(void)
|
||||
SetBrush (* wxWHITE_BRUSH);
|
||||
SetPen (* wxBLACK_PEN);
|
||||
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
|
||||
};
|
||||
}
|
||||
|
||||
wxMemoryDC::wxMemoryDC( wxDC* dc )
|
||||
{
|
||||
@ -80,11 +80,11 @@ wxMemoryDC::wxMemoryDC( wxDC* dc )
|
||||
|
||||
SetBrush (* wxWHITE_BRUSH);
|
||||
SetPen (* wxBLACK_PEN);
|
||||
};
|
||||
}
|
||||
|
||||
wxMemoryDC::~wxMemoryDC(void)
|
||||
{
|
||||
};
|
||||
}
|
||||
|
||||
void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
|
||||
{
|
||||
@ -120,7 +120,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
|
||||
m_ok = false;
|
||||
m_pixmap = (WXPixmap) 0;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
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 (height) (*height) = 0;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
@ -410,7 +410,7 @@ private:
|
||||
DECLARE_DYNAMIC_CLASS(wxIdlePipeModule)
|
||||
};
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxIdlePipeModule, wxModule);
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxIdlePipeModule, wxModule)
|
||||
|
||||
static void wxInputCallback( XtPointer, int* fd, XtInputId* )
|
||||
{
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
#include "wx/icon.h"
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap);
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
|
||||
|
||||
// ============================================================================
|
||||
// Icons
|
||||
|
@ -32,7 +32,7 @@
|
||||
|
||||
#include "wx/motif/private.h"
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl);
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
|
||||
|
||||
bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
|
||||
const wxString& label,
|
||||
|
@ -26,7 +26,7 @@
|
||||
|
||||
#include "wx/motif/private.h"
|
||||
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler);
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
|
||||
|
||||
WX_DECLARE_VOIDPTR_HASH_MAP(wxTimer*, wxTimerHashMap);
|
||||
|
||||
|
@ -529,7 +529,7 @@ void wxGetMousePosition( int* x, int* y )
|
||||
*x = xev.x_root;
|
||||
*y = xev.y_root;
|
||||
#endif
|
||||
};
|
||||
}
|
||||
|
||||
// Return true if we have a colour display
|
||||
bool wxColourDisplay()
|
||||
|
@ -1303,7 +1303,7 @@ int GrGetPixelColor(GR_SCREEN_INFO* sinfo, GR_PALETTE* palette, GR_PIXELVAL pixe
|
||||
// Bitmap handlers
|
||||
// ============================================================================
|
||||
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase);
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase)
|
||||
|
||||
#define M_BMPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData())
|
||||
|
||||
@ -1337,7 +1337,7 @@ public:
|
||||
{ return false; }
|
||||
};
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler);
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
|
||||
|
||||
bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
|
||||
long WXUNUSED(flags), int WXUNUSED(desiredWidth),
|
||||
@ -1451,7 +1451,7 @@ public:
|
||||
int width, int height, int depth = 1);
|
||||
};
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler);
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
|
||||
|
||||
bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *bits,
|
||||
long WXUNUSED(flags),
|
||||
@ -1557,7 +1557,7 @@ public:
|
||||
int width, int height, int depth = 1);
|
||||
};
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler);
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler)
|
||||
|
||||
bool wxXBMDataHandler::Create( wxBitmap *bitmap, void *bits,
|
||||
long WXUNUSED(flags),
|
||||
|
@ -58,8 +58,8 @@ public:
|
||||
#define M_REGIONDATA ((wxRegionRefData *)m_refData)
|
||||
#define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData))
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject);
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject)
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxRegion construction
|
||||
|
Loading…
Reference in New Issue
Block a user