Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/gtk/statbox.h b/include/wx/gtk/statbox.h
index 55a394bf620b4de550e6d30a034dfe6c61043453..77c3393310e13187dfff4c15e383b37d041c6808 100644 (file)
--- a/include/wx/gtk/statbox.h
+++ b/include/wx/gtk/statbox.h
@@ -1,25 +1,20 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifndef __GTKSTATICBOXH__
-#define __GTKSTATICBOXH__
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
+#ifndef _WX_GTKSTATICBOX_H_
+#define _WX_GTKSTATICBOX_H_

 
 //-----------------------------------------------------------------------------
 // wxStaticBox
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxStaticBox
 //-----------------------------------------------------------------------------
 

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

 {
 public:
     wxStaticBox();
 {
 public:
     wxStaticBox();


@@ -45,12 +40,19 @@ public:
 
     // implementation
 
 
     // implementation
 

-    virtual void ApplyWidgetStyle();
+    virtual bool GTKIsTransparentForMouse() const { return true; }
+
+    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
+
+    virtual void AddChild( wxWindowBase *child );
+
+protected:
+    virtual bool GTKWidgetNeedsMnemonic() const;
+    virtual void GTKWidgetDoSetMnemonic(GtkWidget* w);

 
 

-    virtual bool IsTransparentForMouse() const { return TRUE; }
+    void DoApplyWidgetStyle(GtkRcStyle *style);

 
 

-private:

     DECLARE_DYNAMIC_CLASS(wxStaticBox)
 };
 
     DECLARE_DYNAMIC_CLASS(wxStaticBox)
 };
 

-#endif // __GTKSTATICBOXH__
+#endif // _WX_GTKSTATICBOX_H_