projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug with assigning a part of the string to the same string
[wxWidgets.git]
/
src
/
generic
/
statline.cpp
diff --git
a/src/generic/statline.cpp
b/src/generic/statline.cpp
index 28fd5b63d596c4a119c6393916b83f13f5a7fb54..023745015db8b4044064c3c0bd3245f07105d987 100644
(file)
--- a/
src/generic/statline.cpp
+++ b/
src/generic/statline.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: generic/statline.cpp
+// Name:
src/
generic/statline.cpp
// Purpose: a generic wxStaticLine class
// Author: Vadim Zeitlin
// Created: 28.06.99
// Purpose: a generic wxStaticLine class
// Author: Vadim Zeitlin
// Created: 28.06.99
@@
-16,20
+16,21
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "statline.h"
-#endif
-
#include "wx/wxprec.h"
#include "wx/wxprec.h"
-#if wxUSE_STATLINE
+
// For compilers that support precompilation, includes "wx.h".
#ifdef __BORLANDC__
#pragma hdrstop
#endif
// For compilers that support precompilation, includes "wx.h".
#ifdef __BORLANDC__
#pragma hdrstop
#endif
+#if wxUSE_STATLINE
+
#include "wx/statline.h"
#include "wx/statline.h"
-#include "wx/statbox.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/statbox.h"
+#endif
// ============================================================================
// implementation
// ============================================================================
// implementation
@@
-51,16
+52,16
@@
bool wxStaticLine::Create( wxWindow *parent,
m_statbox = NULL;
if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
m_statbox = NULL;
if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
- return
FALSE
;
+ return
false
;
// ok, this is ugly but it's better than nothing: use a thin static box to
// emulate static line
wxSize sizeReal = AdjustSize(size);
// ok, this is ugly but it's better than nothing: use a thin static box to
// emulate static line
wxSize sizeReal = AdjustSize(size);
- m_statbox = new wxStaticBox(parent, id, wx
T("")
, pos, sizeReal, style, name);
+ m_statbox = new wxStaticBox(parent, id, wx
EmptyString
, pos, sizeReal, style, name);
- return
TRUE
;
+ return
true
;
}
wxStaticLine::~wxStaticLine()
}
wxStaticLine::~wxStaticLine()