more extra semicolons removed (patch 1303724)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
c7fe80e285
commit
259c43f679
@ -117,7 +117,7 @@
|
||||
wxAppConsole::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, \
|
||||
libName); \
|
||||
return true; \
|
||||
}; \
|
||||
} \
|
||||
static bool gs_buildOptionsCheck = wxCheckBuildOptions();
|
||||
|
||||
|
||||
|
@ -197,7 +197,7 @@ void name::reset(T * p){ \
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#define wxDEFINE_TIED_SCOPED_PTR_TYPE(T) \
|
||||
wxDEFINE_SCOPED_PTR_TYPE(T); \
|
||||
wxDEFINE_SCOPED_PTR_TYPE(T) \
|
||||
class T ## TiedPtr : public T ## Ptr \
|
||||
{ \
|
||||
public: \
|
||||
@ -216,7 +216,7 @@ void name::reset(T * p){ \
|
||||
private: \
|
||||
T **m_pp; \
|
||||
T *m_pOld; \
|
||||
}
|
||||
};
|
||||
|
||||
#endif // __WX_SCOPED_POINTER__
|
||||
|
||||
|
@ -61,7 +61,7 @@ WX_CHECK_BUILD_OPTIONS("wxCore")
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// this defines wxEventLoopPtr
|
||||
wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop);
|
||||
wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop)
|
||||
|
||||
// ============================================================================
|
||||
// wxAppBase implementation
|
||||
|
@ -38,7 +38,7 @@
|
||||
|
||||
#include "wx/listimpl.cpp"
|
||||
WX_DECLARE_LIST(wxArtProvider, wxArtProvidersList);
|
||||
WX_DEFINE_LIST(wxArtProvidersList);
|
||||
WX_DEFINE_LIST(wxArtProvidersList)
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Cache class - stores already requested bitmaps
|
||||
|
@ -38,7 +38,7 @@
|
||||
|
||||
#include "wx/listimpl.cpp"
|
||||
|
||||
WX_DEFINE_LIST(wxSimpleDataObjectList);
|
||||
WX_DEFINE_LIST(wxSimpleDataObjectList)
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// globals
|
||||
|
@ -40,8 +40,8 @@
|
||||
|
||||
#include "wx/listimpl.cpp"
|
||||
|
||||
WX_DEFINE_LIST(wxMenuList);
|
||||
WX_DEFINE_LIST(wxMenuItemList);
|
||||
WX_DEFINE_LIST(wxMenuList)
|
||||
WX_DEFINE_LIST(wxMenuItemList)
|
||||
|
||||
// ============================================================================
|
||||
// implementation
|
||||
|
@ -78,7 +78,7 @@ wxSize wxPrintPaperType::GetSizeDeviceUnits() const
|
||||
|
||||
WX_DECLARE_LIST(wxPrintPaperType, wxPrintPaperTypeList);
|
||||
#include "wx/listimpl.cpp"
|
||||
WX_DEFINE_LIST(wxPrintPaperTypeList);
|
||||
WX_DEFINE_LIST(wxPrintPaperTypeList)
|
||||
|
||||
wxPrintPaperDatabase* wxThePrintPaperDatabase = (wxPrintPaperDatabase*) NULL;
|
||||
|
||||
|
@ -98,7 +98,7 @@ wxPrinterBase *wxNativePrintFactory::CreatePrinter( wxPrintDialogData *data )
|
||||
#else
|
||||
return new wxPostScriptPrinter( data );
|
||||
#endif
|
||||
};
|
||||
}
|
||||
|
||||
wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *preview,
|
||||
wxPrintout *printout, wxPrintDialogData *data )
|
||||
@ -1136,17 +1136,17 @@ bool wxPrintPreviewBase::SetCurrentPage(int pageNum)
|
||||
}
|
||||
|
||||
int wxPrintPreviewBase::GetCurrentPage() const
|
||||
{ return m_currentPage; };
|
||||
{ return m_currentPage; }
|
||||
void wxPrintPreviewBase::SetPrintout(wxPrintout *printout)
|
||||
{ m_previewPrintout = printout; };
|
||||
{ m_previewPrintout = printout; }
|
||||
wxPrintout *wxPrintPreviewBase::GetPrintout() const
|
||||
{ return m_previewPrintout; };
|
||||
{ return m_previewPrintout; }
|
||||
wxPrintout *wxPrintPreviewBase::GetPrintoutForPrinting() const
|
||||
{ return m_printPrintout; };
|
||||
{ return m_printPrintout; }
|
||||
void wxPrintPreviewBase::SetFrame(wxFrame *frame)
|
||||
{ m_previewFrame = frame; };
|
||||
{ m_previewFrame = frame; }
|
||||
void wxPrintPreviewBase::SetCanvas(wxPreviewCanvas *canvas)
|
||||
{ m_previewCanvas = canvas; };
|
||||
{ m_previewCanvas = canvas; }
|
||||
wxFrame *wxPrintPreviewBase::GetFrame() const
|
||||
{ return m_previewFrame; }
|
||||
wxPreviewCanvas *wxPrintPreviewBase::GetCanvas() const
|
||||
|
@ -46,7 +46,7 @@ IMPLEMENT_CLASS(wxStaticBoxSizer, wxBoxSizer)
|
||||
IMPLEMENT_CLASS(wxStdDialogButtonSizer, wxBoxSizer)
|
||||
#endif
|
||||
|
||||
WX_DEFINE_EXPORTED_LIST( wxSizerItemList );
|
||||
WX_DEFINE_EXPORTED_LIST( wxSizerItemList )
|
||||
|
||||
/*
|
||||
TODO PROPERTIES
|
||||
|
@ -32,7 +32,7 @@
|
||||
#if wxUSE_STATUSBAR
|
||||
|
||||
#include "wx/listimpl.cpp"
|
||||
WX_DEFINE_LIST(wxListString);
|
||||
WX_DEFINE_LIST(wxListString)
|
||||
|
||||
// ============================================================================
|
||||
// wxStatusBarBase implementation
|
||||
|
@ -48,7 +48,7 @@ END_EVENT_TABLE()
|
||||
|
||||
#include "wx/listimpl.cpp"
|
||||
|
||||
WX_DEFINE_LIST(wxToolBarToolsList);
|
||||
WX_DEFINE_LIST(wxToolBarToolsList)
|
||||
|
||||
// ============================================================================
|
||||
// implementation
|
||||
|
@ -72,7 +72,7 @@ BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow)
|
||||
WX_EVENT_TABLE_CONTROL_CONTAINER(wxSplitterWindow)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
WX_DELEGATE_TO_CONTROL_CONTAINER(wxSplitterWindow);
|
||||
WX_DELEGATE_TO_CONTROL_CONTAINER(wxSplitterWindow)
|
||||
|
||||
bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id,
|
||||
const wxPoint& pos,
|
||||
|
@ -52,7 +52,7 @@ struct WXDLLEXPORT wxPaintDCInfo
|
||||
|
||||
#include "wx/arrimpl.cpp"
|
||||
|
||||
WX_DEFINE_OBJARRAY(wxArrayDCInfo);
|
||||
WX_DEFINE_OBJARRAY(wxArrayDCInfo)
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// macros
|
||||
|
@ -143,7 +143,7 @@ private:
|
||||
wxModalEventLoop m_evtLoop;
|
||||
};
|
||||
|
||||
wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData);
|
||||
wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData)
|
||||
|
||||
// ============================================================================
|
||||
// implementation
|
||||
|
@ -45,7 +45,7 @@
|
||||
|
||||
#include "wx/listimpl.cpp"
|
||||
|
||||
WX_DEFINE_LIST(wxMsgList);
|
||||
WX_DEFINE_LIST(wxMsgList)
|
||||
#endif // wxUSE_THREADS
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@ -48,7 +48,7 @@
|
||||
#include "wx/file.h"
|
||||
|
||||
#include "wx/listimpl.cpp"
|
||||
WX_DEFINE_LIST(wxGDIImageHandlerList);
|
||||
WX_DEFINE_LIST(wxGDIImageHandlerList)
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// private classes
|
||||
|
@ -1652,7 +1652,7 @@ int CALLBACK wxInternalDataCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM l
|
||||
|
||||
return internalData->user_fn(d1, d2, internalData->data);
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data)
|
||||
{
|
||||
@ -2581,20 +2581,20 @@ static wxListItemInternalData *wxGetInternalData(HWND hwnd, long itemId)
|
||||
return NULL;
|
||||
|
||||
return (wxListItemInternalData *) it.lParam;
|
||||
};
|
||||
}
|
||||
|
||||
static
|
||||
wxListItemInternalData *wxGetInternalData(const wxListCtrl *ctl, long itemId)
|
||||
{
|
||||
return wxGetInternalData(GetHwndOf(ctl), itemId);
|
||||
};
|
||||
}
|
||||
|
||||
static wxListItemAttr *wxGetInternalDataAttr(wxListCtrl *ctl, long itemId)
|
||||
{
|
||||
wxListItemInternalData *data = wxGetInternalData(ctl, itemId);
|
||||
|
||||
return data ? data->attr : NULL;
|
||||
};
|
||||
}
|
||||
|
||||
static void wxDeleteInternalData(wxListCtrl* ctl, long itemId)
|
||||
{
|
||||
|
@ -122,7 +122,7 @@ UINT GetMenuState(HMENU hMenu, UINT id, UINT flags)
|
||||
|
||||
#include <wx/listimpl.cpp>
|
||||
|
||||
WX_DEFINE_LIST( wxMenuInfoList ) ;
|
||||
WX_DEFINE_LIST( wxMenuInfoList )
|
||||
|
||||
#if wxUSE_EXTENDED_RTTI
|
||||
|
||||
|
@ -105,7 +105,7 @@ LRESULT APIENTRY _EXPORT wxNotebookWndProc(HWND hwnd,
|
||||
|
||||
#include <wx/listimpl.cpp>
|
||||
|
||||
WX_DEFINE_LIST( wxNotebookPageInfoList ) ;
|
||||
WX_DEFINE_LIST( wxNotebookPageInfoList )
|
||||
|
||||
DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
|
||||
DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
|
||||
|
@ -257,7 +257,7 @@ void wxGetMousePosition( int* x, int* y )
|
||||
GetCursorPos( & pt );
|
||||
if ( x ) *x = pt.x;
|
||||
if ( y ) *y = pt.y;
|
||||
};
|
||||
}
|
||||
|
||||
// Return true if we have a colour display
|
||||
bool wxColourDisplay()
|
||||
|
Loading…
Reference in New Issue
Block a user