unicode for mac fixes

[wxWidgets.git] / src / generic / statline.cpp

diff --git a/src/generic/statline.cpp b/src/generic/statline.cpp
index 21ad8938524f9b29ffbf05684c485deef18698ee..28fd5b63d596c4a119c6393916b83f13f5a7fb54 100644 (file)
--- a/src/generic/statline.cpp
+++ b/src/generic/statline.cpp
@@ -16,12 +16,13 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "statline.h"
 #endif
 
     #pragma implementation "statline.h"
 #endif
 

-// For compilers that support precompilation, includes "wx.h".

 #include "wx/wxprec.h"
 #include "wx/wxprec.h"

+#if wxUSE_STATLINE
+// For compilers that support precompilation, includes "wx.h".

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop


@@ -47,7 +48,9 @@ bool wxStaticLine::Create( wxWindow *parent,
                            long style,
                            const wxString &name)
 {
                            long style,
                            const wxString &name)
 {

-    if ( !CreateBase(parent, id, pos, size, style, name) )
+    m_statbox = NULL;
+
+    if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )

         return FALSE;
 
     // ok, this is ugly but it's better than nothing: use a thin static box to
         return FALSE;
 
     // ok, this is ugly but it's better than nothing: use a thin static box to


@@ -55,7 +58,30 @@ bool wxStaticLine::Create( wxWindow *parent,
 
     wxSize sizeReal = AdjustSize(size);
 
 
     wxSize sizeReal = AdjustSize(size);
 

-    m_statbox = new wxStaticBox(parent, id, _T(""), pos, sizeReal, style, name);
+    m_statbox = new wxStaticBox(parent, id, wxT(""), pos, sizeReal, style, name);

 
     return TRUE;
 }
 
     return TRUE;
 }

+
+wxStaticLine::~wxStaticLine()
+{
+    delete m_statbox;
+}
+
+WXWidget wxStaticLine::GetMainWidget() const
+{
+    return m_statbox->GetMainWidget();
+}
+
+void wxStaticLine::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+{
+    m_statbox->SetSize(x, y, width, height, sizeFlags);
+}
+
+void wxStaticLine::DoMoveWindow(int x, int y, int width, int height)
+{
+    m_statbox->SetSize(x, y, width, height);
+}
+
+#endif
+  // wxUSE_STATLINE