projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ 1518434 ] wxSize::Scale with wxScale and wxPoint operators documented
[wxWidgets.git]
/
include
/
wx
/
cocoa
/
statbox.h
diff --git
a/include/wx/cocoa/statbox.h
b/include/wx/cocoa/statbox.h
index d878d27b4d45ceb2ad76ef389c7120bcdc5b64ef..8764385c1e92751c85d96a3acf5dca4bdc957977 100644
(file)
--- a/
include/wx/cocoa/statbox.h
+++ b/
include/wx/cocoa/statbox.h
@@
-6,7
+6,7
@@
// Created: 2003/03/18
// RCS-ID: $Id:
// Copyright: (c) 2003 David Elliott
// Created: 2003/03/18
// RCS-ID: $Id:
// Copyright: (c) 2003 David Elliott
-// Licence: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_STATBOX_H__
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_STATBOX_H__
@@
-27,23
+27,18
@@
class WXDLLEXPORT wxStaticBox: public wxStaticBoxBase, protected wxCocoaNSBox
// ------------------------------------------------------------------------
public:
wxStaticBox() { }
// ------------------------------------------------------------------------
public:
wxStaticBox() { }
- wxStaticBox(wxWindow *parent, wxWindowID winid,
- const wxString& title,
+ wxStaticBox(wxWindow *parent, wxWindowID winid, const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- long style = 0, const wxValidator& validator = wxDefaultValidator,
- const wxString& name = wxStaticBoxNameStr)
+ long style = 0, const wxString& name = wxStaticBoxNameStr)
{
{
- Create(parent, winid, title, pos, size, style,
validator,
name);
+ Create(parent, winid, title, pos, size, style, name);
}
}
- bool Create(wxWindow *parent, wxWindowID winid,
- const wxString& title,
+ bool Create(wxWindow *parent, wxWindowID winid, const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- long style = 0,
- const wxValidator& validator = wxDefaultValidator,
- const wxString& name = wxStaticBoxNameStr);
+ long style = 0, const wxString& name = wxStaticBoxNameStr);
virtual ~wxStaticBox();
// ------------------------------------------------------------------------
virtual ~wxStaticBox();
// ------------------------------------------------------------------------
@@
-56,7
+51,7
@@
protected:
// Implementation
// ------------------------------------------------------------------------
public:
// Implementation
// ------------------------------------------------------------------------
public:
- void GetBordersForSizer(int *borderTop, int *borderOther) const;
+ v
irtual v
oid GetBordersForSizer(int *borderTop, int *borderOther) const;
protected:
};
protected:
};