wxMessageBox off the main thread lost result code.

[wxWidgets.git] / include / wx / msw / statbox.h

diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index decf37139d5f4157cb536226e232af7cb8d69957..7721ccacb15a8a53b301d2673fe0cbbb8bc508f3 100644 (file)
--- a/include/wx/msw/statbox.h
+++ b/include/wx/msw/statbox.h
@@ -1,23 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        statbox.h
+// Name:        wx/msw/statbox.h

 // Purpose:     wxStaticBox class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Purpose:     wxStaticBox class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_STATBOX_H_
-#define _WX_STATBOX_H_
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "statbox.h"
-#endif
+#ifndef _WX_MSW_STATBOX_H_
+#define _WX_MSW_STATBOX_H_

 
 // Group box
 
 // Group box

-class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase
+class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase

 {
 public:
     wxStaticBox() { }
 {
 public:
     wxStaticBox() { }


@@ -39,20 +34,39 @@ public:
                 long style = 0,
                 const wxString& name = wxStaticBoxNameStr);
 
                 long style = 0,
                 const wxString& name = wxStaticBoxNameStr);
 

-    // implementation from now on
-    // --------------------------
+    /// Implementation only
+    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;

 
 

-    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;

 
 

-    // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
+    // returns true if the platform should explicitly apply a theme border
+    virtual bool CanApplyThemeBorder() const { return false; }

 
 protected:
     virtual wxSize DoGetBestSize() const;
 
 
 protected:
     virtual wxSize DoGetBestSize() const;
 

-private:
+#ifndef __WXWINCE__
+public:
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+
+protected:
+    // return the region with all the windows inside this static box excluded
+    virtual WXHRGN MSWGetRegionWithoutChildren();
+
+    // remove the parts which are painted by static box itself from the given
+    // region which is embedded in a rectangle (0, 0)-(w, h)
+    virtual void MSWGetRegionWithoutSelf(WXHRGN hrgn, int w, int h);
+
+    // paint the given rectangle with our background brush/colour
+    virtual void PaintBackground(wxDC& dc, const struct tagRECT& rc);
+    // paint the foreground of the static box
+    virtual void PaintForeground(wxDC& dc, const struct tagRECT& rc);
+
+    void OnPaint(wxPaintEvent& event);
+#endif // !__WXWINCE__
+

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox)
 };
 

-#endif
-    // _WX_STATBOX_H_
+#endif // _WX_MSW_STATBOX_H_
+