wxAuiNotebook* GetNotebook() const;
#if wxUSE_MENUS
- wxMenu* GetWindowMenu() const { return m_pWindowMenu; };
+ wxMenu* GetWindowMenu() const { return m_pWindowMenu; }
void SetWindowMenu(wxMenu* pMenu);
virtual void SetMenuBar(wxMenuBar *pMenuBar);
void SetBitmapLabel(const wxBitmap& bitmap)
{ m_bmpNormal = bitmap; OnSetBitmap(); }
void SetBitmapSelected(const wxBitmap& sel)
- { m_bmpSelected = sel; OnSetBitmap(); };
+ { m_bmpSelected = sel; OnSetBitmap(); }
void SetBitmapFocus(const wxBitmap& focus)
- { m_bmpFocus = focus; OnSetBitmap(); };
+ { m_bmpFocus = focus; OnSetBitmap(); }
void SetBitmapDisabled(const wxBitmap& disabled)
- { m_bmpDisabled = disabled; OnSetBitmap(); };
+ { m_bmpDisabled = disabled; OnSetBitmap(); }
void SetBitmapHover(const wxBitmap& hover)
{ m_bmpHover = hover; OnSetBitmap(); }
wxPrintDialogData(const wxPrintData& printData);
virtual ~wxPrintDialogData();
- int GetFromPage() const { return m_printFromPage; };
- int GetToPage() const { return m_printToPage; };
- int GetMinPage() const { return m_printMinPage; };
- int GetMaxPage() const { return m_printMaxPage; };
- int GetNoCopies() const { return m_printNoCopies; };
- bool GetAllPages() const { return m_printAllPages; };
- bool GetSelection() const { return m_printSelection; };
- bool GetCollate() const { return m_printCollate; };
- bool GetPrintToFile() const { return m_printToFile; };
-
- void SetFromPage(int v) { m_printFromPage = v; };
- void SetToPage(int v) { m_printToPage = v; };
- void SetMinPage(int v) { m_printMinPage = v; };
- void SetMaxPage(int v) { m_printMaxPage = v; };
- void SetNoCopies(int v) { m_printNoCopies = v; };
- void SetAllPages(bool flag) { m_printAllPages = flag; };
- void SetSelection(bool flag) { m_printSelection = flag; };
- void SetCollate(bool flag) { m_printCollate = flag; };
- void SetPrintToFile(bool flag) { m_printToFile = flag; };
-
- void EnablePrintToFile(bool flag) { m_printEnablePrintToFile = flag; };
- void EnableSelection(bool flag) { m_printEnableSelection = flag; };
- void EnablePageNumbers(bool flag) { m_printEnablePageNumbers = flag; };
- void EnableHelp(bool flag) { m_printEnableHelp = flag; };
-
- bool GetEnablePrintToFile() const { return m_printEnablePrintToFile; };
- bool GetEnableSelection() const { return m_printEnableSelection; };
- bool GetEnablePageNumbers() const { return m_printEnablePageNumbers; };
- bool GetEnableHelp() const { return m_printEnableHelp; };
+ int GetFromPage() const { return m_printFromPage; }
+ int GetToPage() const { return m_printToPage; }
+ int GetMinPage() const { return m_printMinPage; }
+ int GetMaxPage() const { return m_printMaxPage; }
+ int GetNoCopies() const { return m_printNoCopies; }
+ bool GetAllPages() const { return m_printAllPages; }
+ bool GetSelection() const { return m_printSelection; }
+ bool GetCollate() const { return m_printCollate; }
+ bool GetPrintToFile() const { return m_printToFile; }
+
+ void SetFromPage(int v) { m_printFromPage = v; }
+ void SetToPage(int v) { m_printToPage = v; }
+ void SetMinPage(int v) { m_printMinPage = v; }
+ void SetMaxPage(int v) { m_printMaxPage = v; }
+ void SetNoCopies(int v) { m_printNoCopies = v; }
+ void SetAllPages(bool flag) { m_printAllPages = flag; }
+ void SetSelection(bool flag) { m_printSelection = flag; }
+ void SetCollate(bool flag) { m_printCollate = flag; }
+ void SetPrintToFile(bool flag) { m_printToFile = flag; }
+
+ void EnablePrintToFile(bool flag) { m_printEnablePrintToFile = flag; }
+ void EnableSelection(bool flag) { m_printEnableSelection = flag; }
+ void EnablePageNumbers(bool flag) { m_printEnablePageNumbers = flag; }
+ void EnableHelp(bool flag) { m_printEnableHelp = flag; }
+
+ bool GetEnablePrintToFile() const { return m_printEnablePrintToFile; }
+ bool GetEnableSelection() const { return m_printEnableSelection; }
+ bool GetEnablePageNumbers() const { return m_printEnablePageNumbers; }
+ bool GetEnableHelp() const { return m_printEnableHelp; }
// Is this data OK for showing the print dialog?
bool Ok() const { return IsOk(); }
wxPageSetupDialogData(const wxPrintData& printData);
virtual ~wxPageSetupDialogData();
- wxSize GetPaperSize() const { return m_paperSize; };
- wxPaperSize GetPaperId() const { return m_printData.GetPaperId(); };
- wxPoint GetMinMarginTopLeft() const { return m_minMarginTopLeft; };
- wxPoint GetMinMarginBottomRight() const { return m_minMarginBottomRight; };
- wxPoint GetMarginTopLeft() const { return m_marginTopLeft; };
- wxPoint GetMarginBottomRight() const { return m_marginBottomRight; };
-
- bool GetDefaultMinMargins() const { return m_defaultMinMargins; };
- bool GetEnableMargins() const { return m_enableMargins; };
- bool GetEnableOrientation() const { return m_enableOrientation; };
- bool GetEnablePaper() const { return m_enablePaper; };
- bool GetEnablePrinter() const { return m_enablePrinter; };
- bool GetDefaultInfo() const { return m_getDefaultInfo; };
- bool GetEnableHelp() const { return m_enableHelp; };
+ wxSize GetPaperSize() const { return m_paperSize; }
+ wxPaperSize GetPaperId() const { return m_printData.GetPaperId(); }
+ wxPoint GetMinMarginTopLeft() const { return m_minMarginTopLeft; }
+ wxPoint GetMinMarginBottomRight() const { return m_minMarginBottomRight; }
+ wxPoint GetMarginTopLeft() const { return m_marginTopLeft; }
+ wxPoint GetMarginBottomRight() const { return m_marginBottomRight; }
+
+ bool GetDefaultMinMargins() const { return m_defaultMinMargins; }
+ bool GetEnableMargins() const { return m_enableMargins; }
+ bool GetEnableOrientation() const { return m_enableOrientation; }
+ bool GetEnablePaper() const { return m_enablePaper; }
+ bool GetEnablePrinter() const { return m_enablePrinter; }
+ bool GetDefaultInfo() const { return m_getDefaultInfo; }
+ bool GetEnableHelp() const { return m_enableHelp; }
// Is this data OK for showing the page setup dialog?
bool Ok() const { return IsOk(); }
// paper size id member as well.
void SetPaperSize(const wxSize& sz);
- void SetPaperId(wxPaperSize id) { m_printData.SetPaperId(id); };
+ void SetPaperId(wxPaperSize id) { m_printData.SetPaperId(id); }
// Sets the wxPrintData id, plus the paper width/height if found in the paper database.
void SetPaperSize(wxPaperSize id);
- void SetMinMarginTopLeft(const wxPoint& pt) { m_minMarginTopLeft = pt; };
- void SetMinMarginBottomRight(const wxPoint& pt) { m_minMarginBottomRight = pt; };
- void SetMarginTopLeft(const wxPoint& pt) { m_marginTopLeft = pt; };
- void SetMarginBottomRight(const wxPoint& pt) { m_marginBottomRight = pt; };
- void SetDefaultMinMargins(bool flag) { m_defaultMinMargins = flag; };
- void SetDefaultInfo(bool flag) { m_getDefaultInfo = flag; };
-
- void EnableMargins(bool flag) { m_enableMargins = flag; };
- void EnableOrientation(bool flag) { m_enableOrientation = flag; };
- void EnablePaper(bool flag) { m_enablePaper = flag; };
- void EnablePrinter(bool flag) { m_enablePrinter = flag; };
- void EnableHelp(bool flag) { m_enableHelp = flag; };
+ void SetMinMarginTopLeft(const wxPoint& pt) { m_minMarginTopLeft = pt; }
+ void SetMinMarginBottomRight(const wxPoint& pt) { m_minMarginBottomRight = pt; }
+ void SetMarginTopLeft(const wxPoint& pt) { m_marginTopLeft = pt; }
+ void SetMarginBottomRight(const wxPoint& pt) { m_marginBottomRight = pt; }
+ void SetDefaultMinMargins(bool flag) { m_defaultMinMargins = flag; }
+ void SetDefaultInfo(bool flag) { m_getDefaultInfo = flag; }
+
+ void EnableMargins(bool flag) { m_enableMargins = flag; }
+ void EnableOrientation(bool flag) { m_enableOrientation = flag; }
+ void EnablePaper(bool flag) { m_enablePaper = flag; }
+ void EnablePrinter(bool flag) { m_enablePrinter = flag; }
+ void EnableHelp(bool flag) { m_enableHelp = flag; }
// Use paper size defined in this object to set the wxPrintData
// paper id
// variable has been initialized before the call.
// NOTE: It is not in constructor so the derived class doesn't need to redefine
// a default constructor of its own.
- virtual void Init() { };
+ virtual void Init() { }
virtual ~wxComboPopup();
void FreeHenv();
// Accessors
- const HENV &GetHenv() { return Henv; };
+ const HENV &GetHenv() { return Henv; }
- const wxChar *GetDsn() { return Dsn; };
+ const wxChar *GetDsn() { return Dsn; }
- const wxChar *GetUid() { return Uid; };
- const wxChar *GetUserID() { return Uid; };
+ const wxChar *GetUid() { return Uid; }
+ const wxChar *GetUserID() { return Uid; }
- const wxChar *GetAuthStr() { return AuthStr; };
- const wxChar *GetPassword() { return AuthStr; };
+ const wxChar *GetAuthStr() { return AuthStr; }
+ const wxChar *GetPassword() { return AuthStr; }
- const wxChar *GetConnectionStr() { return ConnectionStr; };
- bool UseConnectionStr() { return useConnectionStr; };
+ const wxChar *GetConnectionStr() { return ConnectionStr; }
+ bool UseConnectionStr() { return useConnectionStr; }
- const wxChar *GetDescription() { return Description; };
- const wxChar *GetFileType() { return FileType; };
- const wxChar *GetDefaultDir() { return DefaultDir; };
+ const wxChar *GetDescription() { return Description; }
+ const wxChar *GetFileType() { return FileType; }
+ const wxChar *GetDefaultDir() { return DefaultDir; }
- void SetHenv(const HENV henv) { Henv = henv; };
+ void SetHenv(const HENV henv) { Henv = henv; }
void SetDsn(const wxString &dsn);
void SetUserID(const wxString &userID);
- void SetUid(const wxString &uid) { SetUserID(uid); };
+ void SetUid(const wxString &uid) { SetUserID(uid); }
void SetPassword(const wxString &password);
- void SetAuthStr(const wxString &authstr) { SetPassword(authstr); };
+ void SetAuthStr(const wxString &authstr) { SetPassword(authstr); }
void SetConnectionStr(const wxString &connectStr);
- void SetDescription(const wxString &desc) { Description = desc; };
- void SetFileType(const wxString &fileType) { FileType = fileType; };
- void SetDefaultDir(const wxString &defDir) { DefaultDir = defDir; };
+ void SetDescription(const wxString &desc) { Description = desc; }
+ void SetFileType(const wxString &fileType) { FileType = fileType; }
+ void SetDefaultDir(const wxString &defDir) { DefaultDir = defDir; }
}; // class wxDbConnectInf
public:
- void setCached(bool cached) { dbIsCached = cached; }; // This function must only be called by wxDbGetConnection() and wxDbCloseConnections!!!
- bool IsCached() { return dbIsCached; };
+ void setCached(bool cached) { dbIsCached = cached; } // This function must only be called by wxDbGetConnection() and wxDbCloseConnections!!!
+ bool IsCached() { return dbIsCached; }
bool GetDataTypeInfo(SWORD fSqlType, wxDbSqlTypeInfo &structSQLTypeInfo)
{ return getDataTypeInfo(fSqlType, structSQLTypeInfo); }
bool DoGetPixel(wxCoord, wxCoord, class wxColour *) const
- { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoGetPixel Call not implemented")); return true; };
+ { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoGetPixel Call not implemented")); return true; }
virtual bool DoBlit(wxCoord, wxCoord, wxCoord, wxCoord, class wxDC *,
wxCoord, wxCoord, int = wxCOPY, bool = 0, int = -1, int = -1) ;
void DoCrossHair(wxCoord, wxCoord)
- { wxASSERT_MSG (false, wxT("wxSVGFILEDC::CrossHair Call not implemented")); return ; };
+ { wxASSERT_MSG (false, wxT("wxSVGFILEDC::CrossHair Call not implemented")); return ; }
void DoDrawArc(wxCoord, wxCoord, wxCoord, wxCoord, wxCoord, wxCoord);
bool DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour& WXUNUSED(col),
int WXUNUSED(style) = wxFLOOD_SURFACE)
- { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoFloodFill Call not implemented")); return false ; };
+ { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoFloodFill Call not implemented")); return false ; }
- void DoGetSize(int * x, int *y) const { *x = m_width; *y = m_height ; return ; } ;
+ void DoGetSize(int * x, int *y) const { *x = m_width; *y = m_height ; return ; }
void DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent = NULL, wxCoord *externalLeading = NULL, wxFont *font = NULL) const ;
void DoSetClippingRegionAsRegion(const class wxRegion &)
- { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoSetClippingRegionAsRegion Call not yet implemented")); return ; };
+ { wxASSERT_MSG (false, wxT("wxSVGFILEDC::DoSetClippingRegionAsRegion Call not yet implemented")); return ; }
void Init (wxString f, int Width, int Height, float dpi);
~wxSVGFileDC();
- bool CanDrawBitmap() const { return true; };
+ bool CanDrawBitmap() const { return true; }
- bool CanGetTextExtent() const { return true; };
+ bool CanGetTextExtent() const { return true; }
int GetDepth() const
- { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetDepth Call not implemented")); return -1 ; };
+ { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetDepth Call not implemented")); return -1 ; }
- void BeginDrawing() { return;};
+ void BeginDrawing() { return;}
bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC* source, wxCoord xsrc, wxCoord ysrc, int logicalFunc = wxCOPY, bool useMask = false)
- { return DoBlit(xdest, ydest, width, height, source, xsrc, ysrc, logicalFunc, useMask); };
+ { return DoBlit(xdest, ydest, width, height, source, xsrc, ysrc, logicalFunc, useMask); }
void Clear()
- { wxASSERT_MSG (false, wxT("wxSVGFILEDC::Clear() Call not implemented \nNot sensible for an output file?")); return ; };
+ { wxASSERT_MSG (false, wxT("wxSVGFILEDC::Clear() Call not implemented \nNot sensible for an output file?")); return ; }
void CrossHair(wxCoord x, wxCoord y)
- { DoCrossHair (x,y); return; };
+ { DoCrossHair (x,y); return; }
virtual void ComputeScaleAndOrigin();
void DestroyClippingRegion()
- { wxASSERT_MSG (false, wxT("wxSVGFILEDC::void Call not yet implemented")); return ; };
+ { wxASSERT_MSG (false, wxT("wxSVGFILEDC::void Call not yet implemented")); return ; }
wxCoord DeviceToLogicalX(wxCoord x) const ;
wxCoord DeviceToLogicalYRel(wxCoord y) const ;
void DrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, bool transparent)
- { DoDrawBitmap ( bitmap, x, y, transparent ) ; return ;};
+ { DoDrawBitmap ( bitmap, x, y, transparent ) ; return ;}
void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
- {DoDrawIcon(icon, x, y) ; return ; };
+ {DoDrawIcon(icon, x, y) ; return ; }
void DoDrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0) ;
void EndDoc()
- { return ; };
+ { return ; }
void EndDrawing()
- { return ; };
+ { return ; }
void EndPage()
- { return ; };
+ { return ; }
void FloodFill(wxCoord x, wxCoord y, wxColour *colour, int style=wxFLOOD_SURFACE)
- { DoFloodFill (x, y, *colour, style); return ;} ;
+ { DoFloodFill (x, y, *colour, style); return ;}
wxCoord GetCharHeight() const;
wxCoord GetCharWidth() const;
void GetClippingBox(wxCoord *WXUNUSED(x), wxCoord *WXUNUSED(y), wxCoord * WXUNUSED(width), wxCoord * WXUNUSED(height))
- { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetClippingBox Call not yet implemented")); return ; };
+ { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetClippingBox Call not yet implemented")); return ; }
int GetLogicalFunction()
- { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetLogicalFunction() Call not implemented")); return wxCOPY ; };
+ { wxASSERT_MSG (false, wxT("wxSVGFILEDC::GetLogicalFunction() Call not implemented")); return wxCOPY ; }
int GetMapMode() ;
bool GetPixel(wxCoord x, wxCoord y, wxColour *colour)
- { return DoGetPixel (x, y, colour) ; } ;
+ { return DoGetPixel (x, y, colour) ; }
void GetUserScale(double *x, double *y) const ;
wxCoord LogicalToDeviceYRel(wxCoord y) const ;
- bool Ok() const {return m_OK;};
+ bool Ok() const {return m_OK;}
void SetAxisOrientation( bool xLeftRight, bool yBottomUp ) ;
void SetClippingRegion(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxCoord WXUNUSED(width), wxCoord WXUNUSED(height))
- { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetClippingRegion Call not yet implemented")); return ; };
+ { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetClippingRegion Call not yet implemented")); return ; }
void SetPalette(const wxPalette& WXUNUSED(palette))
- { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetPalette Call not yet implemented")); return ; };
+ { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetPalette Call not yet implemented")); return ; }
void SetBackground( const wxBrush &brush ) ;
void SetFont(const wxFont& font) ;
void SetLogicalFunction(int WXUNUSED(function))
- { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetLogicalFunction Call implemented")); return ; };
+ { wxASSERT_MSG (false, wxT("wxSVGFILEDC::SetLogicalFunction Call implemented")); return ; }
void SetLogicalScale( double x, double y ) ;
void SetUserScale(double xScale, double yScale) ;
bool StartDoc(const wxString& WXUNUSED(message))
- { return false; };
+ { return false; }
void StartPage()
- { return ; };
+ { return ; }
};
#endif // __DCSVG_H
void SetFilename(const wxString& filename, bool notifyViews = false);
wxString GetFilename() const { return m_documentFile; }
- void SetTitle(const wxString& title) { m_documentTitle = title; };
+ void SetTitle(const wxString& title) { m_documentTitle = title; }
wxString GetTitle() const { return m_documentTitle; }
- void SetDocumentName(const wxString& name) { m_documentTypeName = name; };
+ void SetDocumentName(const wxString& name) { m_documentTypeName = name; }
wxString GetDocumentName() const { return m_documentTypeName; }
bool GetDocumentSaved() const { return m_savedYet; }
virtual void SetDocument(wxDocument *doc);
wxString GetViewName() const { return m_viewTypeName; }
- void SetViewName(const wxString& name) { m_viewTypeName = name; };
+ void SetViewName(const wxString& name) { m_viewTypeName = name; }
wxWindow *GetFrame() const { return m_viewFrame ; }
void SetFrame(wxWindow *frame) { m_viewFrame = frame; }
// Called by framework if created automatically by the default document
// manager class: gives view a chance to initialise
- virtual bool OnCreate(wxDocument *WXUNUSED(doc), long WXUNUSED(flags)) { return true; };
+ virtual bool OnCreate(wxDocument *WXUNUSED(doc), long WXUNUSED(flags)) { return true; }
// Checks if the view is the last one for the document; if so, asks user
// to confirm save data (if modified). If ok, deletes itself and returns
// creation
virtual bool InitDocument(wxDocument* doc, const wxString& path, long flags = 0);
- wxString GetDefaultExtension() const { return m_defaultExt; };
+ wxString GetDefaultExtension() const { return m_defaultExt; }
wxString GetDescription() const { return m_description; }
- wxString GetDirectory() const { return m_directory; };
+ wxString GetDirectory() const { return m_directory; }
wxDocManager *GetDocumentManager() const { return m_documentManager; }
void SetDocumentManager(wxDocManager *manager) { m_documentManager = manager; }
- wxString GetFileFilter() const { return m_fileFilter; };
- long GetFlags() const { return m_flags; };
+ wxString GetFileFilter() const { return m_fileFilter; }
+ long GetFlags() const { return m_flags; }
virtual wxString GetViewName() const { return m_viewTypeName; }
virtual wxString GetDocumentName() const { return m_docTypeName; }
- void SetFileFilter(const wxString& filter) { m_fileFilter = filter; };
- void SetDirectory(const wxString& dir) { m_directory = dir; };
- void SetDescription(const wxString& descr) { m_description = descr; };
- void SetDefaultExtension(const wxString& ext) { m_defaultExt = ext; };
- void SetFlags(long flags) { m_flags = flags; };
+ void SetFileFilter(const wxString& filter) { m_fileFilter = filter; }
+ void SetDirectory(const wxString& dir) { m_directory = dir; }
+ void SetDescription(const wxString& descr) { m_description = descr; }
+ void SetDefaultExtension(const wxString& ext) { m_defaultExt = ext; }
+ void SetFlags(long flags) { m_flags = flags; }
bool IsVisible() const { return ((m_flags & wxTEMPLATE_VISIBLE) == wxTEMPLATE_VISIBLE); }
const_reverse_iterator rbegin() const; \
reverse_iterator rend() { return reverse_iterator(begin() - 1); } \
const_reverse_iterator rend() const; \
- void reserve(size_type n) { base::reserve(n); }; \
+ void reserve(size_type n) { base::reserve(n); } \
void resize(size_type n, value_type v = value_type()) \
{ base::resize(n, v); } \
}
// to allow the event processing by the base classes (calling event.Skip()
// is the analog of calling the base class version of a virtual function)
void Skip(bool skip = true) { m_skipped = skip; }
- bool GetSkipped() const { return m_skipped; };
+ bool GetSkipped() const { return m_skipped; }
// this function is used to create a copy of the event polymorphically and
// all derived classes must implement it because otherwise wxPostEvent()
virtual wxEvent *Clone() const { return new wxMouseCaptureChangedEvent(*this); }
- wxWindow* GetCapturedWindow() const { return m_gainedCapture; };
+ wxWindow* GetCapturedWindow() const { return m_gainedCapture; }
private:
wxWindow* m_gainedCapture;
const wxSize& size = wxDefaultSize, long style = wxSW_3D|wxCLIP_CHILDREN, const wxString& name = wxT("layoutWindow"));
// Accessors
- inline wxLayoutAlignment GetAlignment() const { return m_alignment; };
- inline wxLayoutOrientation GetOrientation() const { return m_orientation; };
+ inline wxLayoutAlignment GetAlignment() const { return m_alignment; }
+ inline wxLayoutOrientation GetOrientation() const { return m_orientation; }
- inline void SetAlignment(wxLayoutAlignment align) { m_alignment = align; };
- inline void SetOrientation(wxLayoutOrientation orient) { m_orientation = orient; };
+ inline void SetAlignment(wxLayoutAlignment align) { m_alignment = align; }
+ inline void SetOrientation(wxLayoutOrientation orient) { m_orientation = orient; }
// Give the window default dimensions
inline void SetDefaultSize(const wxSize& size) { m_defaultSize = size; }
}
// Gets the split mode
- wxSplitMode GetSplitMode() const { return m_splitMode; };
+ wxSplitMode GetSplitMode() const { return m_splitMode; }
// Initialize with one window
void Initialize(wxWindow *window);
typedef wxHashTableBase_Node Node;
wxHashTableBase();
- virtual ~wxHashTableBase() { };
+ virtual ~wxHashTableBase() { }
void Create( wxKeyType keyType = wxKEY_INTEGER,
size_t size = wxHASH_SIZE_DEFAULT );
const_iterator end() const { return const_iterator( 0, this ); } \
iterator end() { return iterator( 0, this ); } \
const_iterator begin() const \
- { return const_iterator( (Node*)GetFirstNode( m_tableBuckets, (_wxHashTable_NodeBase**)m_table ), this ); }; \
+ { return const_iterator( (Node*)GetFirstNode( m_tableBuckets, (_wxHashTable_NodeBase**)m_table ), this ); } \
iterator begin() \
- { return iterator( (Node*)GetFirstNode( m_tableBuckets, (_wxHashTable_NodeBase**)m_table ), this ); }; \
+ { return iterator( (Node*)GetFirstNode( m_tableBuckets, (_wxHashTable_NodeBase**)m_table ), this ); } \
\
size_type erase( const const_key_type& key ) \
{ \
virtual bool DisplaySection(int sectionNo) = 0;
// Display the section using a context id
- virtual bool DisplayContextPopup(int WXUNUSED(contextId)) { return false; };
+ virtual bool DisplayContextPopup(int WXUNUSED(contextId)) { return false; }
// Display the text in a popup, if possible
virtual bool DisplayTextPopup(const wxString& WXUNUSED(text), const wxPoint& WXUNUSED(pos)) { return false; }
void SetTitleFormat(const wxString& format);
// Override to add custom buttons to the toolbar
- virtual void AddToolbarButtons(wxToolBar* WXUNUSED(toolBar), int WXUNUSED(style)) {};
+ virtual void AddToolbarButtons(wxToolBar* WXUNUSED(toolBar), int WXUNUSED(style)) {}
protected:
void Init(wxHtmlHelpData* data = NULL);
void AddGrabIfNeeded();
// Override to add custom buttons to the toolbar
- virtual void AddToolbarButtons(wxToolBar* WXUNUSED(toolBar), int WXUNUSED(style)) {};
+ virtual void AddToolbarButtons(wxToolBar* WXUNUSED(toolBar), int WXUNUSED(style)) {}
// we don't want to prevent the app from closing just because a help window
// remains opened
public:
wxHtmlWinTagHandler() : wxHtmlTagHandler() {}
- virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;};
+ virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;}
protected:
wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted
m_extension = _T("bmp");
m_type = wxBITMAP_TYPE_BMP;
m_mime = _T("image/x-bmp");
- };
+ }
#if wxUSE_STREAMS
virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );
m_extension = _T("ico");
m_type = wxBITMAP_TYPE_ICO;
m_mime = _T("image/x-ico");
- };
+ }
#if wxUSE_STREAMS
virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );
m_extension = _T("cur");
m_type = wxBITMAP_TYPE_CUR;
m_mime = _T("image/x-cur");
- };
+ }
// VS: This handler's meat is implemented inside wxICOHandler (the two
// formats are almost identical), but we hide this fact at
m_extension = _T("ani");
m_type = wxBITMAP_TYPE_ANI;
m_mime = _T("image/x-ani");
- };
+ }
#if wxUSE_STREAMS
- virtual bool SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose=true) ){return false ;};
+ virtual bool SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose=true) ){return false ;}
virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 );
virtual int GetImageCount( wxInputStream& stream );
protected:
wxChar *WXUNUSED(data),
int WXUNUSED(size),
wxIPCFormat WXUNUSED(format) )
- { return false; };
+ { return false; }
virtual wxChar *OnRequest ( const wxString& WXUNUSED(topic),
const wxString& WXUNUSED(item),
int *WXUNUSED(size),
wxIPCFormat WXUNUSED(format) )
- { return (wxChar *) NULL; };
+ { return (wxChar *) NULL; }
virtual bool OnPoke ( const wxString& WXUNUSED(topic),
const wxString& WXUNUSED(item),
wxChar *WXUNUSED(data),
int WXUNUSED(size),
wxIPCFormat WXUNUSED(format) )
- { return false; };
+ { return false; }
virtual bool OnStartAdvise ( const wxString& WXUNUSED(topic),
const wxString& WXUNUSED(item) )
- { return false; };
+ { return false; }
virtual bool OnStopAdvise ( const wxString& WXUNUSED(topic),
const wxString& WXUNUSED(item) )
- { return false; };
+ { return false; }
// Callbacks to CLIENT - override at will
virtual bool OnAdvise ( const wxString& WXUNUSED(topic),
wxChar *WXUNUSED(data),
int WXUNUSED(size),
wxIPCFormat WXUNUSED(format) )
- { return false; };
+ { return false; }
// Callbacks to BOTH - override at will
// Default behaviour is to delete connection and return true
// Is the matrix the identity matrix?
// Only returns a flag, which is set whenever an operation
// is done.
- inline bool IsIdentity(void) const { return m_isIdentity; };
+ inline bool IsIdentity(void) const { return m_isIdentity; }
// This does an actual check.
inline bool IsIdentity1(void) const ;
bool operator != (const wxColour& colour) const { return !(*this == colour); }
- WXCOLORREF GetPixel() const { return m_pixel; };
+ WXCOLORREF GetPixel() const { return m_pixel; }
public:
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
// For ownerdraw items
- virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return false; };
- virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return false; };
+ virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return false; }
+ virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return false; }
const wxArrayLong& GetSubcontrols() const { return m_subControls; }
// TODO: should this go into a wxFrameworkSettings class perhaps?
static void UseNativeStatusBar(bool useNative)
- { m_useNativeStatusBar = useNative; };
+ { m_useNativeStatusBar = useNative; }
static bool UsesNativeStatusBar()
- { return m_useNativeStatusBar; };
+ { return m_useNativeStatusBar; }
#endif // wxUSE_STATUSBAR
#if wxUSE_MENUS
virtual wxMDIClientWindow *OnCreateClient(void);
// MDI windows menu
- wxMenu* GetWindowMenu() const { return m_windowMenu; };
+ wxMenu* GetWindowMenu() const { return m_windowMenu; }
void SetWindowMenu(wxMenu* menu) ;
virtual void DoMenuUpdates(wxMenu* menu = NULL);
virtual ~wxAutomationObject();
// Set/get dispatch pointer
- inline void SetDispatchPtr(WXIDISPATCH* dispatchPtr) { m_dispatchPtr = dispatchPtr; };
+ inline void SetDispatchPtr(WXIDISPATCH* dispatchPtr) { m_dispatchPtr = dispatchPtr; }
inline WXIDISPATCH* GetDispatchPtr() const { return m_dispatchPtr; }
// Get a dispatch pointer from the current object associated
wxWindow *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const;
// MSW 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; }
#if wxUSE_TOOLTIPS
// MSW only: true if this window or any of its children have a tooltip
// Parameters set up
// set transfer mode now
- void SetPassive(bool pasv) { m_bPassive = pasv; };
+ void SetPassive(bool pasv) { m_bPassive = pasv; }
void SetDefaultTimeout(wxUint32 Value);
bool SetBinary() { return SetTransferMode(BINARY); }
bool SetAscii() { return SetTransferMode(ASCII); }
// state
inline bool Ok() const { return IsOk(); }
- inline bool IsOk() const { return (m_socket != NULL); };
- inline bool Error() const { return m_error; };
- inline bool IsConnected() const { return m_connected; };
- inline bool IsData() { return WaitForRead(0, 0); };
- inline bool IsDisconnected() const { return !IsConnected(); };
+ inline bool IsOk() const { return (m_socket != NULL); }
+ inline bool Error() const { return m_error; }
+ inline bool IsConnected() const { return m_connected; }
+ inline bool IsData() { return WaitForRead(0, 0); }
+ inline bool IsDisconnected() const { return !IsConnected(); }
inline wxUint32 LastCount() const { return m_lcount; }
inline wxSocketError LastError() const { return (wxSocketError)m_socket->GetError(); }
void SaveState();
wxSocketBase& Write(const void *buffer, wxUint32 nbytes);
wxSocketBase& WriteMsg(const void *buffer, wxUint32 nbytes);
- void InterruptWait() { m_interrupt = true; };
+ void InterruptWait() { m_interrupt = true; }
bool Wait(long seconds = -1, long milliseconds = 0);
bool WaitForRead(long seconds = -1, long milliseconds = 0);
bool WaitForWrite(long seconds = -1, long milliseconds = 0);
bool GetOption(int level, int optname, void *optval, int *optlen);
bool SetOption(int level, int optname, const void *optval, int optlen);
- inline wxUint32 GetLastIOSize() const { return m_lcount; };
+ inline wxUint32 GetLastIOSize() const { return m_lcount; }
// event handling
void *GetClientData() const { return m_clientData; }
// get/set the size of the bitmaps used by the toolbar: should be called
// before adding any tools to the toolbar
virtual void SetToolBitmapSize(const wxSize& size)
- { m_defaultWidth = size.x; m_defaultHeight = size.y; };
+ { m_defaultWidth = size.x; m_defaultHeight = size.y; }
virtual wxSize GetToolBitmapSize() const
{ return wxSize(m_defaultWidth, m_defaultHeight); }
// the button size in some implementations is bigger than the bitmap size:
// get the total button size (by default the same as bitmap size)
virtual wxSize GetToolSize() const
- { return GetToolBitmapSize(); } ;
+ { return GetToolBitmapSize(); }
// returns a (non separator) tool containing the point (x, y) or NULL if
// there is no tool at this point (corrdinates are client)
wxDEFINE_COMPARISONS(wchar_t, const wxUniCharRef&, wxCMP_REVERSE)
#ifdef wxWINT_T_IS_SEPARATE_TYPE
-wxDEFINE_COMPARISONS(wint_t, const wxUniChar&, wxCMP_REVERSE)
+//wxDEFINE_COMPARISONS(wint_t, const wxUniChar&, wxCMP_REVERSE)
wxDEFINE_COMPARISONS(wint_t, const wxUniCharRef&, wxCMP_REVERSE)
#endif
// Called when the value in the window must be validated.
// This function can pop up an error message.
- virtual bool Validate(wxWindow *WXUNUSED(parent)) { return false; };
+ virtual bool Validate(wxWindow *WXUNUSED(parent)) { return false; }
// Called to transfer data to the window
virtual bool TransferToWindow() { return false; }
// Called to transfer data from the window
- virtual bool TransferFromWindow() { return false; };
+ virtual bool TransferFromWindow() { return false; }
// accessors
wxWindow *GetWindow() const { return (wxWindow *)m_validatorWindow; }
#define _WX_DECLARE_VECTOR(obj, cls, exp)\
class exp cls : public wxVectorBase\
{\
- WX_DECLARE_VECTORBASE(obj, cls);\
+ WX_DECLARE_VECTORBASE(obj, cls)\
public:\
void push_back(const obj& o)\
{\
void SetAccessible(wxAccessible* accessible) ;
// Returns the accessible object.
- wxAccessible* GetAccessible() { return m_accessible; };
+ wxAccessible* GetAccessible() { return m_accessible; }
// Returns the accessible object, creating if necessary.
wxAccessible* GetOrCreateAccessible() ;
DECLARE_DYNAMIC_CLASS(wxImageModule)
public:
wxImageModule() {}
- bool OnInit() { wxImage::InitStandardHandlers(); return true; };
- void OnExit() { wxImage::CleanUpHandlers(); };
+ bool OnInit() { wxImage::InitStandardHandlers(); return true; }
+ void OnExit() { wxImage::CleanUpHandlers(); }
};
IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
virtual bool Write(wxOutputStream &str) const;
#endif // wxUSE_STREAMS
- virtual wxString GetType() const { return wxT("long"); };
+ virtual wxString GetType() const { return wxT("long"); }
protected:
long m_value;
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream &str) const;
#endif // wxUSE_STREAMS
- virtual wxString GetType() const { return wxT("double"); };
+ virtual wxString GetType() const { return wxT("double"); }
protected:
double m_value;
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream& str) const;
#endif // wxUSE_STREAMS
- virtual wxString GetType() const { return wxT("bool"); };
+ virtual wxString GetType() const { return wxT("bool"); }
protected:
bool m_value;
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream& str) const;
#endif // wxUSE_STREAMS
- virtual wxString GetType() const { return wxT("char"); };
+ virtual wxString GetType() const { return wxT("char"); }
protected:
wxChar m_value;
virtual bool Read(wxString& str);
virtual bool Write(wxString& str) const;
#if wxUSE_STD_IOSTREAM
- virtual bool Read(wxSTD istream& WXUNUSED(str)) { return false; };
+ virtual bool Read(wxSTD istream& WXUNUSED(str)) { return false; }
#endif
#if wxUSE_STREAMS
virtual bool Read(wxInputStream& str);
virtual bool Write(wxOutputStream& str) const;
#endif // wxUSE_STREAMS
- virtual wxString GetType() const { return wxT("string"); };
+ virtual wxString GetType() const { return wxT("string"); }
protected:
wxString m_value;
virtual bool Read(wxSTD istream& str);
#endif
virtual bool Read(wxString& str);
- virtual wxString GetType() const { return wxT("void*"); };
+ virtual wxString GetType() const { return wxT("void*"); }
virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; }
protected:
virtual bool Read(wxSTD istream& str);
#endif
virtual bool Read(wxString& str);
- virtual wxString GetType() const { return wxT("datetime"); };
+ virtual wxString GetType() const { return wxT("datetime"); }
virtual wxVariantData* Clone() { return new wxVariantDataDateTime; }
protected:
virtual bool Read(wxSTD istream& str);
#endif
virtual bool Read(wxString& str);
- virtual wxString GetType() const { return wxT("arrstring"); };
+ virtual wxString GetType() const { return wxT("arrstring"); }
virtual wxVariantData* Clone() { return new wxVariantDataArrayString; }
protected:
virtual bool Read(wxSTD istream& str);
#endif
virtual bool Read(wxString& str);
- virtual wxString GetType() const { return wxT("list"); };
+ virtual wxString GetType() const { return wxT("list"); }
void Clear();
DECLARE_DYNAMIC_CLASS(wxAnimationModule)
public:
wxAnimationModule() {}
- bool OnInit() { wxAnimation::InitStandardHandlers(); return true; };
- void OnExit() { wxAnimation::CleanUpHandlers(); };
+ bool OnInit() { wxAnimation::InitStandardHandlers(); return true; }
+ void OnExit() { wxAnimation::CleanUpHandlers(); }
};
IMPLEMENT_DYNAMIC_CLASS(wxAnimationModule, wxModule)
bool HasCurrentRow() { return m_currentRow != (unsigned int)-1; }
void ChangeCurrentRow( unsigned int row );
- bool IsSingleSel() const { return !GetParent()->HasFlag(wxDV_MULTIPLE); };
+ bool IsSingleSel() const { return !GetParent()->HasFlag(wxDV_MULTIPLE); }
bool IsEmpty() { return GetRowCount() == 0; }
int GetCountPerPage() const;
DECLARE_DYNAMIC_CLASS(wxGenericRendererModule)
public:
wxGenericRendererModule() {}
- bool OnInit() { return true; };
- void OnExit() { wxRendererGeneric::Cleanup(); };
+ bool OnInit() { return true; }
+ void OnExit() { wxRendererGeneric::Cleanup(); }
};
IMPLEMENT_DYNAMIC_CLASS(wxGenericRendererModule, wxModule)
wxOnceOnlyDLLLoader(const wxChar *dllName)
: m_dllName(dllName)
{
- };
+ }
// return the symbol with the given name or NULL if the DLL not loaded
{
if (attr)
delete attr;
- };
+ }
DECLARE_NO_COPY_CLASS(wxListItemInternalData)
};
bool m_ok;
public:
- wxDL_VOIDMETHOD_DEFINE( StartMovie, (Movie m), (m) );
- wxDL_VOIDMETHOD_DEFINE( StopMovie, (Movie m), (m) );
- wxDL_METHOD_DEFINE( bool, IsMovieDone, (Movie m), (m), false);
- wxDL_VOIDMETHOD_DEFINE( GoToBeginningOfMovie, (Movie m), (m) );
- wxDL_METHOD_DEFINE( OSErr, GetMoviesError, (), (), -1);
- wxDL_METHOD_DEFINE( OSErr, EnterMovies, (), (), -1);
- wxDL_VOIDMETHOD_DEFINE( ExitMovies, (), () );
- wxDL_METHOD_DEFINE( OSErr, InitializeQTML, (long flags), (flags), -1);
- wxDL_VOIDMETHOD_DEFINE( TerminateQTML, (), () );
+ wxDL_VOIDMETHOD_DEFINE( StartMovie, (Movie m), (m) )
+ wxDL_VOIDMETHOD_DEFINE( StopMovie, (Movie m), (m) )
+ wxDL_METHOD_DEFINE( bool, IsMovieDone, (Movie m), (m), false)
+ wxDL_VOIDMETHOD_DEFINE( GoToBeginningOfMovie, (Movie m), (m) )
+ wxDL_METHOD_DEFINE( OSErr, GetMoviesError, (), (), -1)
+ wxDL_METHOD_DEFINE( OSErr, EnterMovies, (), (), -1)
+ wxDL_VOIDMETHOD_DEFINE( ExitMovies, (), () )
+ wxDL_METHOD_DEFINE( OSErr, InitializeQTML, (long flags), (flags), -1)
+ wxDL_VOIDMETHOD_DEFINE( TerminateQTML, (), () )
wxDL_METHOD_DEFINE( OSErr, NativePathNameToFSSpec,
(char* inName, FSSpec* outFile, long flags),
- (inName, outFile, flags), -1);
+ (inName, outFile, flags), -1)
wxDL_METHOD_DEFINE( OSErr, OpenMovieFile,
(const FSSpec * fileSpec, short * resRefNum, wxInt8 permission),
- (fileSpec, resRefNum, permission), -1 );
+ (fileSpec, resRefNum, permission), -1 )
wxDL_METHOD_DEFINE( OSErr, CloseMovieFile,
- (short resRefNum), (resRefNum), -1);
+ (short resRefNum), (resRefNum), -1)
wxDL_METHOD_DEFINE( OSErr, NewMovieFromFile,
(Movie * theMovie, short resRefNum, short * resId,
StringPtr resName, short newMovieFlags,
bool * dataRefWasChanged),
(theMovie, resRefNum, resId, resName, newMovieFlags,
- dataRefWasChanged), -1);
+ dataRefWasChanged), -1)
- wxDL_VOIDMETHOD_DEFINE( SetMovieRate, (Movie m, Fixed rate), (m, rate) );
- wxDL_METHOD_DEFINE( Fixed, GetMovieRate, (Movie m), (m), 0);
- wxDL_VOIDMETHOD_DEFINE( MoviesTask, (Movie m, long maxms), (m, maxms) );
+ wxDL_VOIDMETHOD_DEFINE( SetMovieRate, (Movie m, Fixed rate), (m, rate) )
+ wxDL_METHOD_DEFINE( Fixed, GetMovieRate, (Movie m), (m), 0)
+ wxDL_VOIDMETHOD_DEFINE( MoviesTask, (Movie m, long maxms), (m, maxms) )
wxDL_VOIDMETHOD_DEFINE( BlockMove,
- (const char* p1, const char* p2, long s), (p1,p2,s) );
- wxDL_METHOD_DEFINE( Handle, NewHandleClear, (long s), (s), NULL );
+ (const char* p1, const char* p2, long s), (p1,p2,s) )
+ wxDL_METHOD_DEFINE( Handle, NewHandleClear, (long s), (s), NULL )
wxDL_METHOD_DEFINE( OSErr, NewMovieFromDataRef,
(Movie * m, short flags, short * id,
Handle dataRef, OSType dataRefType),
- (m,flags,id,dataRef,dataRefType), -1 );
+ (m,flags,id,dataRef,dataRefType), -1 )
- wxDL_VOIDMETHOD_DEFINE( DisposeHandle, (Handle h), (h) );
- wxDL_VOIDMETHOD_DEFINE( GetMovieNaturalBoundsRect, (Movie m, Rect* r), (m,r) );
+ wxDL_VOIDMETHOD_DEFINE( DisposeHandle, (Handle h), (h) )
+ wxDL_VOIDMETHOD_DEFINE( GetMovieNaturalBoundsRect, (Movie m, Rect* r), (m,r) )
wxDL_METHOD_DEFINE( void*, GetMovieIndTrackType,
(Movie m, long index, OSType type, long flags),
- (m,index,type,flags), NULL );
+ (m,index,type,flags), NULL )
wxDL_VOIDMETHOD_DEFINE( CreatePortAssociation,
- (void* hWnd, void* junk, long morejunk), (hWnd, junk, morejunk) );
- wxDL_METHOD_DEFINE(void*, GetNativeWindowPort, (void* hWnd), (hWnd), NULL);
+ (void* hWnd, void* junk, long morejunk), (hWnd, junk, morejunk) )
+ wxDL_METHOD_DEFINE(void*, GetNativeWindowPort, (void* hWnd), (hWnd), NULL)
wxDL_VOIDMETHOD_DEFINE(SetMovieGWorld, (Movie m, CGrafPtr port, void* whatever),
- (m, port, whatever) );
- wxDL_VOIDMETHOD_DEFINE(DisposeMovie, (Movie m), (m) );
- wxDL_VOIDMETHOD_DEFINE(SetMovieBox, (Movie m, Rect* r), (m,r));
- wxDL_VOIDMETHOD_DEFINE(SetMovieTimeScale, (Movie m, long s), (m,s));
- wxDL_METHOD_DEFINE(long, GetMovieDuration, (Movie m), (m), 0);
- wxDL_METHOD_DEFINE(TimeBase, GetMovieTimeBase, (Movie m), (m), 0);
- wxDL_METHOD_DEFINE(TimeScale, GetMovieTimeScale, (Movie m), (m), 0);
- wxDL_METHOD_DEFINE(long, GetMovieTime, (Movie m, void* cruft), (m,cruft), 0);
- wxDL_VOIDMETHOD_DEFINE(SetMovieTime, (Movie m, TimeRecord* tr), (m,tr) );
- wxDL_METHOD_DEFINE(short, GetMovieVolume, (Movie m), (m), 0);
- wxDL_VOIDMETHOD_DEFINE(SetMovieVolume, (Movie m, short sVolume), (m,sVolume) );
- wxDL_VOIDMETHOD_DEFINE(SetMovieTimeValue, (Movie m, long s), (m,s));
- wxDL_METHOD_DEFINE(ComponentInstance, NewMovieController, (Movie m, const Rect* mr, long fl), (m,mr,fl), 0);
- wxDL_VOIDMETHOD_DEFINE(DisposeMovieController, (ComponentInstance ci), (ci));
- wxDL_METHOD_DEFINE(int, MCSetVisible, (ComponentInstance m, int b), (m, b), 0);
-
- wxDL_VOIDMETHOD_DEFINE(PrePrerollMovie, (Movie m, long t, Fixed r, WXFARPROC p1, void* p2), (m,t,r,p1,p2) );
- wxDL_VOIDMETHOD_DEFINE(PrerollMovie, (Movie m, long t, Fixed r), (m,t,r) );
- wxDL_METHOD_DEFINE(Fixed, GetMoviePreferredRate, (Movie m), (m), 0);
- wxDL_METHOD_DEFINE(long, GetMovieLoadState, (Movie m), (m), 0);
- wxDL_METHOD_DEFINE(void*, NewRoutineDescriptor, (WXFARPROC f, int l, void* junk), (f, l, junk), 0);
- wxDL_VOIDMETHOD_DEFINE(DisposeRoutineDescriptor, (void* f), (f));
- wxDL_METHOD_DEFINE(void*, GetCurrentArchitecture, (), (), 0);
- wxDL_METHOD_DEFINE(int, MCDoAction, (ComponentInstance ci, long f, void* p), (ci,f,p), 0);
- wxDL_VOIDMETHOD_DEFINE(MCSetControllerBoundsRect, (ComponentInstance ci, Rect* r), (ci,r));
- wxDL_VOIDMETHOD_DEFINE(DestroyPortAssociation, (CGrafPtr g), (g));
- wxDL_VOIDMETHOD_DEFINE(NativeEventToMacEvent, (MSG* p1, EventRecord* p2), (p1,p2));
- wxDL_VOIDMETHOD_DEFINE(MCIsPlayerEvent, (ComponentInstance ci, EventRecord* p2), (ci, p2));
+ (m, port, whatever) )
+ wxDL_VOIDMETHOD_DEFINE(DisposeMovie, (Movie m), (m) )
+ wxDL_VOIDMETHOD_DEFINE(SetMovieBox, (Movie m, Rect* r), (m,r))
+ wxDL_VOIDMETHOD_DEFINE(SetMovieTimeScale, (Movie m, long s), (m,s))
+ wxDL_METHOD_DEFINE(long, GetMovieDuration, (Movie m), (m), 0)
+ wxDL_METHOD_DEFINE(TimeBase, GetMovieTimeBase, (Movie m), (m), 0)
+ wxDL_METHOD_DEFINE(TimeScale, GetMovieTimeScale, (Movie m), (m), 0)
+ wxDL_METHOD_DEFINE(long, GetMovieTime, (Movie m, void* cruft), (m,cruft), 0)
+ wxDL_VOIDMETHOD_DEFINE(SetMovieTime, (Movie m, TimeRecord* tr), (m,tr) )
+ wxDL_METHOD_DEFINE(short, GetMovieVolume, (Movie m), (m), 0)
+ wxDL_VOIDMETHOD_DEFINE(SetMovieVolume, (Movie m, short sVolume), (m,sVolume) )
+ wxDL_VOIDMETHOD_DEFINE(SetMovieTimeValue, (Movie m, long s), (m,s))
+ wxDL_METHOD_DEFINE(ComponentInstance, NewMovieController, (Movie m, const Rect* mr, long fl), (m,mr,fl), 0)
+ wxDL_VOIDMETHOD_DEFINE(DisposeMovieController, (ComponentInstance ci), (ci))
+ wxDL_METHOD_DEFINE(int, MCSetVisible, (ComponentInstance m, int b), (m, b), 0)
+
+ wxDL_VOIDMETHOD_DEFINE(PrePrerollMovie, (Movie m, long t, Fixed r, WXFARPROC p1, void* p2), (m,t,r,p1,p2) )
+ wxDL_VOIDMETHOD_DEFINE(PrerollMovie, (Movie m, long t, Fixed r), (m,t,r) )
+ wxDL_METHOD_DEFINE(Fixed, GetMoviePreferredRate, (Movie m), (m), 0)
+ wxDL_METHOD_DEFINE(long, GetMovieLoadState, (Movie m), (m), 0)
+ wxDL_METHOD_DEFINE(void*, NewRoutineDescriptor, (WXFARPROC f, int l, void* junk), (f, l, junk), 0)
+ wxDL_VOIDMETHOD_DEFINE(DisposeRoutineDescriptor, (void* f), (f))
+ wxDL_METHOD_DEFINE(void*, GetCurrentArchitecture, (), (), 0)
+ wxDL_METHOD_DEFINE(int, MCDoAction, (ComponentInstance ci, long f, void* p), (ci,f,p), 0)
+ wxDL_VOIDMETHOD_DEFINE(MCSetControllerBoundsRect, (ComponentInstance ci, Rect* r), (ci,r))
+ wxDL_VOIDMETHOD_DEFINE(DestroyPortAssociation, (CGrafPtr g), (g))
+ wxDL_VOIDMETHOD_DEFINE(NativeEventToMacEvent, (MSG* p1, EventRecord* p2), (p1,p2))
+ wxDL_VOIDMETHOD_DEFINE(MCIsPlayerEvent, (ComponentInstance ci, EventRecord* p2), (ci, p2))
wxDL_METHOD_DEFINE(int, MCSetMovie, (ComponentInstance ci, Movie m, void* p1, Point w),
- (ci,m,p1,w),0);
+ (ci,m,p1,w),0)
wxDL_VOIDMETHOD_DEFINE(MCPositionController,
- (ComponentInstance ci, Rect* r, void* junk, void* morejunk), (ci,r,junk,morejunk));
+ (ComponentInstance ci, Rect* r, void* junk, void* morejunk), (ci,r,junk,morejunk))
wxDL_VOIDMETHOD_DEFINE(MCSetActionFilterWithRefCon,
- (ComponentInstance ci, WXFARPROC cb, void* ref), (ci,cb,ref));
- wxDL_VOIDMETHOD_DEFINE(MCGetControllerInfo, (MovieController mc, long* flags), (mc,flags));
- wxDL_VOIDMETHOD_DEFINE(BeginUpdate, (CGrafPtr port), (port));
- wxDL_VOIDMETHOD_DEFINE(UpdateMovie, (Movie m), (m));
- wxDL_VOIDMETHOD_DEFINE(EndUpdate, (CGrafPtr port), (port));
- wxDL_METHOD_DEFINE( OSErr, GetMoviesStickyError, (), (), -1);
+ (ComponentInstance ci, WXFARPROC cb, void* ref), (ci,cb,ref))
+ wxDL_VOIDMETHOD_DEFINE(MCGetControllerInfo, (MovieController mc, long* flags), (mc,flags))
+ wxDL_VOIDMETHOD_DEFINE(BeginUpdate, (CGrafPtr port), (port))
+ wxDL_VOIDMETHOD_DEFINE(UpdateMovie, (Movie m), (m))
+ wxDL_VOIDMETHOD_DEFINE(EndUpdate, (CGrafPtr port), (port))
+ wxDL_METHOD_DEFINE( OSErr, GetMoviesStickyError, (), (), -1)
};
bool wxQuickTimeLibrary::Initialize()
}
return CallNextHookEx(ms_hMsgHookProc, nCode, wParam, lParam);
- };
+ }
private:
static HHOOK ms_hMsgHookProc;
wxRichTextBuffer::InitStandardHandlers();
wxRichTextParagraph::InitDefaultTabs();
return true;
- };
+ }
void OnExit()
{
wxRichTextBuffer::CleanUpHandlers();
wxRichTextParagraph::ClearDefaultTabs();
wxRichTextCtrl::ClearAvailableFontNames();
wxRichTextBuffer::SetRenderer(NULL);
- };
+ }
};
IMPLEMENT_DYNAMIC_CLASS(wxRichTextModule, wxModule)
DECLARE_DYNAMIC_CLASS(wxRichTextFormattingDialogModule)
public:
wxRichTextFormattingDialogModule() {}
- bool OnInit() { wxRichTextFormattingDialog::SetFormattingDialogFactory(new wxRichTextFormattingDialogFactory); return true; };
- void OnExit() { wxRichTextFormattingDialog::SetFormattingDialogFactory(NULL); };
+ bool OnInit() { wxRichTextFormattingDialog::SetFormattingDialogFactory(new wxRichTextFormattingDialogFactory); return true; }
+ void OnExit() { wxRichTextFormattingDialog::SetFormattingDialogFactory(NULL); }
};
IMPLEMENT_DYNAMIC_CLASS(wxRichTextFormattingDialogModule, wxModule)
Surface(const Surface &) {}
Surface &operator=(const Surface &) { return *this; }
public:
- Surface() {};
- virtual ~Surface() {};
+ Surface() {}
+ virtual ~Surface() {}
static Surface *Allocate();
virtual void Init(WindowID wid)=0;
*/
class DynamicLibrary {
public:
- virtual ~DynamicLibrary() {};
+ virtual ~DynamicLibrary() {}
/// @return Pointer to function "name", or NULL on failure.
virtual Function FindFunction(const char *name) = 0;
}
void StartAt(unsigned int start, char chMask=31);
- void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; };
+ void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; }
unsigned int GetStartSegment() { return startSeg; }
void StartSegment(unsigned int pos);
void ColourTo(unsigned int pos, int chAttr);
Range(Position pos=0) :
start(pos), end(pos) {
- };
+ }
Range(Position start_, Position end_) :
start(start_), end(end_) {
- };
+ }
bool Valid() const {
return (start != invalidPosition) && (end != invalidPosition);
WindowID GetWindow() { return id; }
void StartAt(unsigned int start, char chMask=31);
- void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; };
+ void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; }
unsigned int GetStartSegment() { return startSeg; }
void StartSegment(unsigned int pos);
void ColourTo(unsigned int pos, int chAttr);
const char *languageName_=0, LexerFunction fnFolder_=0) : LexerModule(language_, fnLexer_, 0, fnFolder_){
strncpy(name, languageName_, sizeof(name));
languageName = name;
- };
+ }
virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle,
WordList *keywordlists[], Accessor &styler) const;
virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle,
void ClearTo(const Style &source);
bool EquivalentFontTo(const Style *other) const;
void Realise(Surface &surface, int zoomLevel, Style *defaultStyle = 0, bool extraFontFlag = false);
- bool IsProtected() const { return !(changeable && visible);};
+ bool IsProtected() const { return !(changeable && visible);}
};
#endif
projects / wxWidgets.git / commitdiff
