projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added patch #412132 (Fix for bug #215410) (Mainly in CalcDimensions()),
[wxWidgets.git]
/
src
/
msw
/
statline.cpp
diff --git
a/src/msw/statline.cpp
b/src/msw/statline.cpp
index 2e55df4d409ff6efa687e3e668b1c073e822c4da..605153f40d4e185595d34c9d192ad60c9e9252e9 100644
(file)
--- a/
src/msw/statline.cpp
+++ b/
src/msw/statline.cpp
@@
-29,7
+29,18
@@
#include "wx/statline.h"
#include "wx/statline.h"
+#if wxUSE_STATLINE
+
#include "wx/msw/private.h"
#include "wx/msw/private.h"
+#include "wx/log.h"
+
+#ifndef SS_SUNKEN
+ #define SS_SUNKEN 0x00001000L
+#endif
+
+#ifndef SS_NOTIFY
+ #define SS_NOTIFY 0x00000100L
+#endif
// ============================================================================
// implementation
// ============================================================================
// implementation
@@
-48,7
+59,7
@@
bool wxStaticLine::Create( wxWindow *parent,
long style,
const wxString &name)
{
long style,
const wxString &name)
{
- if ( !CreateBase(parent, id, pos, size, style, name) )
+ if ( !CreateBase(parent, id, pos, size, style,
wxDefaultValidator,
name) )
return FALSE;
parent->AddChild(this);
return FALSE;
parent->AddChild(this);
@@
-57,10
+68,10
@@
bool wxStaticLine::Create( wxWindow *parent,
m_hWnd = (WXHWND)::CreateWindow
(
m_hWnd = (WXHWND)::CreateWindow
(
-
_
T("STATIC"),
-
""
,
- WS_VISIBLE | WS_CHILD |
- SS_GRAYRECT | SS_SUNKEN
,// | SS_ETCHEDFRAME
,
+
wx
T("STATIC"),
+
wxT("")
,
+ WS_VISIBLE | WS_CHILD
/* | WS_CLIPSIBLINGS */
|
+ SS_GRAYRECT | SS_SUNKEN
| SS_NOTIFY
,
pos.x, pos.y, sizeReal.x, sizeReal.y,
GetWinHwnd(parent),
(HMENU)m_windowId,
pos.x, pos.y, sizeReal.x, sizeReal.y,
GetWinHwnd(parent),
(HMENU)m_windowId,
@@
-70,7
+81,7
@@
bool wxStaticLine::Create( wxWindow *parent,
if ( !m_hWnd )
{
if ( !m_hWnd )
{
- wxLogDebug(
_
T("Failed to create static control"));
+ wxLogDebug(
wx
T("Failed to create static control"));
return FALSE;
}
return FALSE;
}
@@
-80,3
+91,5
@@
bool wxStaticLine::Create( wxWindow *parent,
return TRUE;
}
return TRUE;
}
+#endif // wxUSE_STATLINE
+