Must strip menu codes from labels before measuring (fixes bug 1400552)

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

diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp
index 313c3f1453cd4db6921775e406f7023ff1ba19aa..521b9e04caee35a8e0f17de194b365debb0a9802 100644 (file)
--- a/src/msw/statline.cpp
+++ b/src/msw/statline.cpp
@@ -16,10 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "statline.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -32,15 +28,7 @@
 #if wxUSE_STATLINE
 
 #include "wx/msw/private.h"
 #if wxUSE_STATLINE
 
 #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
+#include "wx/msw/missing.h"

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -58,21 +46,21 @@ wxBEGIN_FLAGS( wxStaticLineStyle )
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)

-    
+

     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)
     wxFLAGS_MEMBER(wxDOUBLE_BORDER)
     wxFLAGS_MEMBER(wxRAISED_BORDER)
     wxFLAGS_MEMBER(wxSTATIC_BORDER)
     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)
     wxFLAGS_MEMBER(wxDOUBLE_BORDER)
     wxFLAGS_MEMBER(wxRAISED_BORDER)
     wxFLAGS_MEMBER(wxSTATIC_BORDER)

-    wxFLAGS_MEMBER(wxNO_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)

 
     // standard window styles
     wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
     wxFLAGS_MEMBER(wxCLIP_CHILDREN)
     wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
     wxFLAGS_MEMBER(wxWANTS_CHARS)
 
     // standard window styles
     wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
     wxFLAGS_MEMBER(wxCLIP_CHILDREN)
     wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
     wxFLAGS_MEMBER(wxWANTS_CHARS)

-    wxFLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)

     wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
     wxFLAGS_MEMBER(wxVSCROLL)
     wxFLAGS_MEMBER(wxHSCROLL)
     wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
     wxFLAGS_MEMBER(wxVSCROLL)
     wxFLAGS_MEMBER(wxHSCROLL)


@@ -85,7 +73,7 @@ wxEND_FLAGS( wxStaticLineStyle )
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticLine, wxControl,"wx/statline.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxStaticLine)
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticLine, wxControl,"wx/statline.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxStaticLine)

-    wxPROPERTY_FLAGS( WindowStyle , wxStaticLineStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+    wxPROPERTY_FLAGS( WindowStyle , wxStaticLineStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style

 wxEND_PROPERTIES_TABLE()
 
 wxBEGIN_HANDLERS_TABLE(wxStaticLine)
 wxEND_PROPERTIES_TABLE()
 
 wxBEGIN_HANDLERS_TABLE(wxStaticLine)


@@ -98,8 +86,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
 #endif
 
 /*
 #endif
 
 /*

-       TODO PROPERTIES :
-               style (wxLI_HORIZONTAL)
+    TODO PROPERTIES :
+        style (wxLI_HORIZONTAL)

 */
 
 // ----------------------------------------------------------------------------
 */
 
 // ----------------------------------------------------------------------------


@@ -116,7 +104,7 @@ bool wxStaticLine::Create(wxWindow *parent,
     wxSize size = AdjustSize(sizeOrig);
 
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
     wxSize size = AdjustSize(sizeOrig);
 
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )

-        return FALSE;
+        return false;

 
     return MSWCreateControl(_T("STATIC"), wxEmptyString, pos, size);
 }
 
     return MSWCreateControl(_T("STATIC"), wxEmptyString, pos, size);
 }