Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

[wxWidgets.git] / include / wx / univ / stattext.h

diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h
index 869b9960da8bc8f93e92b737a6494f00aa1b4059..810aa35869399ed03bbd130108541a36f564c4f8 100644 (file)
--- a/include/wx/univ/stattext.h
+++ b/include/wx/univ/stattext.h
@@ -19,6 +19,8 @@
 class WXDLLEXPORT wxStaticText : public wxStaticTextBase
 {
 public:
 class WXDLLEXPORT wxStaticText : public wxStaticTextBase
 {
 public:

+    wxStaticText() { }
+

     // usual ctor
     wxStaticText(wxWindow *parent,
                  const wxString& label,
     // usual ctor
     wxStaticText(wxWindow *parent,
                  const wxString& label,


@@ -33,7 +35,7 @@ public:
                  wxWindowID id,
                  const wxString& label,
                  const wxPoint& pos = wxDefaultPosition,
                  wxWindowID id,
                  const wxString& label,
                  const wxPoint& pos = wxDefaultPosition,

-                 const wxSize& size = wxDefaultSize, 
+                 const wxSize& size = wxDefaultSize,

                  long style = 0,
                  const wxString &name = wxStaticTextNameStr)
     {
                  long style = 0,
                  const wxString &name = wxStaticTextNameStr)
     {


@@ -45,7 +47,7 @@ public:
                 wxWindowID id,
                 const wxString &label,
                 const wxPoint &pos = wxDefaultPosition,
                 wxWindowID id,
                 const wxString &label,
                 const wxPoint &pos = wxDefaultPosition,

-                const wxSize &size = wxDefaultSize, 
+                const wxSize &size = wxDefaultSize,

                 long style = 0,
                 const wxString &name = wxStaticTextNameStr);
 
                 long style = 0,
                 const wxString &name = wxStaticTextNameStr);
 


@@ -53,12 +55,16 @@ public:
 
     virtual void SetLabel(const wxString& label);
 
 
     virtual void SetLabel(const wxString& label);
 

+    virtual bool HasTransparentBackground() { return TRUE; }
+    

 protected:
     // calculate the optimal size for the label
     virtual wxSize DoGetBestClientSize() const;
 
     // draw the control
     virtual void DoDraw(wxControlRenderer *renderer);
 protected:
     // calculate the optimal size for the label
     virtual wxSize DoGetBestClientSize() const;
 
     // draw the control
     virtual void DoDraw(wxControlRenderer *renderer);

+
+    DECLARE_ABSTRACT_CLASS(wxStaticText)

 };
 
 #endif // _WX_UNIV_STATTEXT_H_
 };
 
 #endif // _WX_UNIV_STATTEXT_H_