projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
support for vetoing grid cell editing (patch 469049)
[wxWidgets.git]
/
include
/
wx
/
mac
/
frame.h
diff --git
a/include/wx/mac/frame.h
b/include/wx/mac/frame.h
index c3032d69f04bcf556797043fc6bccd90031c23eb..39498bd06bb4df241c15538cf4ccf474a7fab42f 100644
(file)
--- a/
include/wx/mac/frame.h
+++ b/
include/wx/mac/frame.h
@@
-1,6
+1,6
@@
/////////////////////////////////////////////////////////////////////////////
// Name: frame.h
/////////////////////////////////////////////////////////////////////////////
// Name: frame.h
-// Purpose: wxFrame
Mac
class
+// Purpose: wxFrame class
// Author: AUTHOR
// Modified by:
// Created: ??/??/98
// Author: AUTHOR
// Modified by:
// Created: ??/??/98
@@
-28,14
+28,12
@@
class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxStatusBar;
class WXDLLEXPORT wxMacToolTip ;
class WXDLLEXPORT wxStatusBar;
class WXDLLEXPORT wxMacToolTip ;
-class WXDLLEXPORT wxFrameMac: public wxFrameBase {
-
- DECLARE_DYNAMIC_CLASS(wxFrameMac)
-
+class WXDLLEXPORT wxFrame: public wxFrameBase
+{
public:
// construction
public:
// construction
- wxFrame
Mac
() { Init(); }
- wxFrame
Mac
(wxWindow *parent,
+ wxFrame() { Init(); }
+ wxFrame(wxWindow *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
@@
-56,7
+54,7
@@
public:
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr);
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr);
- virtual ~wxFrame
Mac
();
+ virtual ~wxFrame();
// implementation only from now on
// -------------------------------
// implementation only from now on
// -------------------------------
@@
-120,6
+118,7
@@
protected:
private:
DECLARE_EVENT_TABLE()
private:
DECLARE_EVENT_TABLE()
+ DECLARE_DYNAMIC_CLASS(wxFrame)
};
#endif
};
#endif