projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hopefully fixed library names generated by wx-config for OS/2's PM port.
[wxWidgets.git]
/
src
/
mac
/
carbon
/
statlmac.cpp
diff --git
a/src/mac/carbon/statlmac.cpp
b/src/mac/carbon/statlmac.cpp
index a7a116ba571cc17d391ba59d5f5edf3b2f0bb31e..80d0ea1c4977c41417abcab5aa07081005a9c6a6 100644
(file)
--- a/
src/mac/carbon/statlmac.cpp
+++ b/
src/mac/carbon/statlmac.cpp
@@
-16,13
+16,15
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "statline.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma implementation "statline.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
+#if wxUSE_STATLINE
+
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifdef __BORLANDC__
#pragma hdrstop
#endif
@@
-49,19
+51,19
@@
bool wxStaticLine::Create( wxWindow *parent,
long style,
const wxString &name)
{
long style,
const wxString &name)
{
+ m_macIsUserPane = FALSE ;
+
if ( !wxStaticLineBase::Create(parent, id, pos, size,
style, wxDefaultValidator, name) )
return false;
if ( !wxStaticLineBase::Create(parent, id, pos, size,
style, wxDefaultValidator, name) )
return false;
- Rect bounds ;
- Str255 title ;
-
- MacPreControlCreate( parent , id , wxEmptyString , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
+ Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+ m_peer = new wxMacControl(this) ;
+ verify_noerr(CreateSeparatorControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, m_peer->GetControlRefAddr() ) ) ;
- m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1,
- kControlSeparatorLineProc , (long) this ) ;
-
- MacPostControlCreate() ;
+ MacPostControlCreate(pos,size) ;
return TRUE;
}
return TRUE;
}
+
+#endif //wxUSE_STATLINE