projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
corrected/removed forward declarations
[wxWidgets.git]
/
include
/
wx
/
univ
/
statbox.h
diff --git
a/include/wx/univ/statbox.h
b/include/wx/univ/statbox.h
index fd8ff41262b863eb6df6be84d98a0a5f2751a44a..333e1985dc3a411beb383986a805172a16f9dab1 100644
(file)
--- a/
include/wx/univ/statbox.h
+++ b/
include/wx/univ/statbox.h
@@
-12,10
+12,6
@@
#ifndef _WX_UNIV_STATBOX_H_
#define _WX_UNIV_STATBOX_H_
#ifndef _WX_UNIV_STATBOX_H_
#define _WX_UNIV_STATBOX_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "univstatbox.h"
-#endif
-
class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase
{
public:
class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase
{
public:
@@
-26,7
+22,7
@@
public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize)
{
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize)
{
- Create(parent,
-1
, label, pos, size);
+ Create(parent,
wxID_ANY
, label, pos, size);
}
wxStaticBox(wxWindow *parent, wxWindowID id,
}
wxStaticBox(wxWindow *parent, wxWindowID id,
@@
-51,8
+47,10
@@
public:
// take account of this
virtual wxPoint GetBoxAreaOrigin() const;
// take account of this
virtual wxPoint GetBoxAreaOrigin() const;
- virtual bool HasTransparentBackground() { return TRUE; }
-
+ // returning true from here ensures that we act as a container window for
+ // our children
+ virtual bool IsStaticBox() const { return true; }
+
protected:
// draw the control
virtual void DoDraw(wxControlRenderer *renderer);
protected:
// draw the control
virtual void DoDraw(wxControlRenderer *renderer);
@@
-60,10
+58,6
@@
protected:
// get the size of the border
wxRect GetBorderGeometry() const;
// get the size of the border
wxRect GetBorderGeometry() const;
- // returning TRUE from here ensures that we act as a container window for
- // our children
- virtual bool IsStaticBox() const { return TRUE; }
-
private:
DECLARE_DYNAMIC_CLASS(wxStaticBox)
};
private:
DECLARE_DYNAMIC_CLASS(wxStaticBox)
};