Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index 7eee31685e5865e01c88ca1b31a2afd9a20ea0de..e1ea580b4be7aedcc3ea842050c8bfc93f2c497a 100644 (file)
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxStaticBox base header
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxStaticBox base header
 // Author:      Julian Smart
 // Modified by:


@@ -17,20 +17,20 @@
 #if wxUSE_STATBOX
 
 #include "wx/control.h"
 #if wxUSE_STATBOX
 
 #include "wx/control.h"

+#include "wx/containr.h"

 
 

-extern WXDLLEXPORT_DATA(const char) wxStaticBoxNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBoxNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxStaticBox: a grouping box with a label
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxStaticBox: a grouping box with a label
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxStaticBoxBase : public wxControl
+class WXDLLIMPEXP_CORE wxStaticBoxBase : public wxNavigationEnabled<wxControl>

 {
 public:
 {
 public:

-    wxStaticBoxBase() { }
+    wxStaticBoxBase() { m_container.DisableSelfFocus(); }

 
 

-    // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return false; }
+    // overridden base class virtuals

     virtual bool HasTransparentBackground() { return true; }
 
     // implementation only: this is used by wxStaticBoxSizer to account for the
     virtual bool HasTransparentBackground() { return true; }
 
     // implementation only: this is used by wxStaticBoxSizer to account for the


@@ -46,11 +46,11 @@ public:
         *borderOther = BORDER;
     }
 
         *borderOther = BORDER;
     }
 

-private:
+protected:

     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 

-    DECLARE_NO_COPY_CLASS(wxStaticBoxBase)
+    wxDECLARE_NO_COPY_CLASS(wxStaticBoxBase);

 };
 
 #if defined(__WXUNIVERSAL__)
 };
 
 #if defined(__WXUNIVERSAL__)


@@ -64,7 +64,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/statbox.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXGTK__)
     #include "wx/gtk1/statbox.h"
 #elif defined(__WXMAC__)

-    #include "wx/mac/statbox.h"
+    #include "wx/osx/statbox.h"

 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/statbox.h"
 #elif defined(__WXPM__)
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/statbox.h"
 #elif defined(__WXPM__)