unicode fixes

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

diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp
index 4299f2948eed0aa839657f8179d70379a481047b..0c745d6590a7220f7c5bd45e30c0335ef2dc8181 100644 (file)
--- a/src/msw/gauge95.cpp
+++ b/src/msw/gauge95.cpp
@@ -67,17 +67,51 @@
 // ----------------------------------------------------------------------------
 
 #if wxUSE_EXTENDED_RTTI
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxGauge95, wxControl,"wx/gauge.h")
+WX_DEFINE_FLAGS( wxGaugeStyle )
+
+WX_BEGIN_FLAGS( wxGaugeStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    WX_FLAGS_MEMBER(wxBORDER_SIMPLE)
+    WX_FLAGS_MEMBER(wxBORDER_SUNKEN)
+    WX_FLAGS_MEMBER(wxBORDER_DOUBLE)
+    WX_FLAGS_MEMBER(wxBORDER_RAISED)
+    WX_FLAGS_MEMBER(wxBORDER_STATIC)
+    WX_FLAGS_MEMBER(wxBORDER_NONE)
+    
+    // old style border flags
+    WX_FLAGS_MEMBER(wxSIMPLE_BORDER)
+    WX_FLAGS_MEMBER(wxSUNKEN_BORDER)
+    WX_FLAGS_MEMBER(wxDOUBLE_BORDER)
+    WX_FLAGS_MEMBER(wxRAISED_BORDER)
+    WX_FLAGS_MEMBER(wxSTATIC_BORDER)
+    WX_FLAGS_MEMBER(wxNO_BORDER)
+
+    // standard window styles
+    WX_FLAGS_MEMBER(wxTAB_TRAVERSAL)
+    WX_FLAGS_MEMBER(wxCLIP_CHILDREN)
+    WX_FLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    WX_FLAGS_MEMBER(wxWANTS_CHARS)
+    WX_FLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
+    WX_FLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    WX_FLAGS_MEMBER(wxVSCROLL)
+    WX_FLAGS_MEMBER(wxHSCROLL)
+
+    WX_FLAGS_MEMBER(wxGA_HORIZONTAL)
+    WX_FLAGS_MEMBER(wxGA_VERTICAL)
+    WX_FLAGS_MEMBER(wxGA_PROGRESSBAR)
+    WX_FLAGS_MEMBER(wxGA_SMOOTH)
+
+WX_END_FLAGS( wxGaugeStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxGauge, wxControl,"wx/gauge.h")
 
 WX_BEGIN_PROPERTIES_TABLE(wxGauge95)
-       WX_PROPERTY( Value , int , SetValue, GetValue, 0 )
-       WX_PROPERTY( Range , int , SetRange, GetRange, 0 )
-       WX_PROPERTY( ShadowWidth , int , SetShadowWidth, GetShadowWidth, 0 )
-       WX_PROPERTY( BezelFace , int , SetBezelFace, GetBezelFace, 0 )
-/*
-       TODO PROPERTIES
-               style wxGA_HORIZONTAL
-*/
+       WX_PROPERTY( Value , int , SetValue, GetValue, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+       WX_PROPERTY( Range , int , SetRange, GetRange, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+       WX_PROPERTY( ShadowWidth , int , SetShadowWidth, GetShadowWidth, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+       WX_PROPERTY( BezelFace , int , SetBezelFace, GetBezelFace, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    WX_PROPERTY_FLAGS( WindowStyle , wxGaugeStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
 WX_END_PROPERTIES_TABLE()
 
 WX_BEGIN_HANDLERS_TABLE(wxGauge95)