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

Use wx-prefixed macros throughout the repository.

Browse Source 
Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE
occurrences to use the wx-prefixed version of the macros.
This commit is contained in:
Dimitri Schoolwerth
2015-04-23 15:49:01 +04:00
parent 2d3f617b34
commit 8f8d58d193
1697 changed files with 3543 additions and 3543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/osx/carbon/dataview.h
View File

@@ -315,7 +315,7 @@ private:
//
// wxWidget internal stuff
//
DECLARE_ABSTRACT_CLASS(wxMacDataBrowserTableViewControl)
wxDECLARE_ABSTRACT_CLASS(wxMacDataBrowserTableViewControl);
};
// ============================================================================

2
include/wx/osx/carbon/drawer.h
View File

@@ -24,7 +24,7 @@
class WXDLLIMPEXP_ADV wxDrawerWindow : public wxTopLevelWindow
{
DECLARE_DYNAMIC_CLASS(wxDrawerWindow)
wxDECLARE_DYNAMIC_CLASS(wxDrawerWindow);
public:

10
include/wx/osx/carbon/private.h
View File

@@ -440,7 +440,7 @@ protected :
ControlRef m_controlRef;
wxFont m_font;
long m_windowStyle;
DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacControl)
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMacControl);
};
// ============================================================================
@@ -581,7 +581,7 @@ protected :
virtual Boolean CompareItems(DataBrowserItemID itemOneID,
DataBrowserItemID itemTwoID,
DataBrowserPropertyID sortProperty) = 0;
DECLARE_ABSTRACT_CLASS(wxMacDataBrowserControl)
wxDECLARE_ABSTRACT_CLASS(wxMacDataBrowserControl);
};
// ============================================================================
@@ -755,7 +755,7 @@ protected:
private :
bool m_suppressSelection;
DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataItemBrowserControl)
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataItemBrowserControl);
};
class WXDLLIMPEXP_CORE wxMacDataItemBrowserSelectionSuppressor
@@ -894,7 +894,7 @@ private:
wxArrayMacDataBrowserColumns m_columns;
int m_nextColumnId ;
DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataBrowserListControl)
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataBrowserListControl);
};
// ============================================================================
@@ -1038,7 +1038,7 @@ protected :
WXEVENTHANDLERREF m_macEventHandler ;
WindowRef m_macWindow;
void * m_macFullScreenData ;
DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCarbonImpl)
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCarbonImpl);
};
#endif // wxUSE_GUI

6
include/wx/osx/carbon/private/print.h
View File

@@ -55,7 +55,7 @@ protected :
PMPrintSettings m_macPrintSettings ;
PMPaper m_macPaper;
private:
DECLARE_DYNAMIC_CLASS(wxOSXPrintData)
wxDECLARE_DYNAMIC_CLASS(wxOSXPrintData);
} ;
WXDLLIMPEXP_CORE wxPrintNativeDataBase* wxOSXCreatePrintData();
@@ -67,7 +67,7 @@ public:
wxOSXCarbonPrintData();
virtual ~wxOSXCarbonPrintData();
private:
DECLARE_DYNAMIC_CLASS(wxOSXCarbonPrintData)
wxDECLARE_DYNAMIC_CLASS(wxOSXCarbonPrintData);
} ;
#endif
@@ -85,7 +85,7 @@ protected:
WX_NSPrintInfo m_macPrintInfo;
private:
DECLARE_DYNAMIC_CLASS(wxOSXCocoaPrintData)
wxDECLARE_DYNAMIC_CLASS(wxOSXCocoaPrintData);
} ;
#endif

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

@@ -57,7 +57,7 @@ protected:
virtual bool DoUnionWithRect(const wxRect& rect);
private:
DECLARE_DYNAMIC_CLASS(wxRegion)
wxDECLARE_DYNAMIC_CLASS(wxRegion);
friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator;
};
@@ -96,7 +96,7 @@ private:
wxRegion m_region;
wxRect* m_rects;
DECLARE_DYNAMIC_CLASS(wxRegionIterator)
wxDECLARE_DYNAMIC_CLASS(wxRegionIterator);
};
#endif // _WX_MAC_CARBON_REGION_H_

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

@@ -15,8 +15,8 @@
class WXDLLIMPEXP_CORE wxStaticBitmap: public wxStaticBitmapBase
{
DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
public:
wxDECLARE_DYNAMIC_CLASS(wxStaticBitmap);
public:
wxStaticBitmap() { }
wxStaticBitmap(wxWindow *parent, wxWindowID id,
@@ -57,7 +57,7 @@ class WXDLLIMPEXP_CORE wxStaticBitmap: public wxStaticBitmapBase
virtual wxSize DoGetBestSize() const;
wxBitmap m_bitmap;
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
#endif