X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3571e1add4e6ceb45ad88c224c432609f837a8dd..59859d3da18244fa31f82c30ded14f619c3c967f:/src/generic/commandlinkbuttong.cpp?ds=sidebyside

diff --git a/src/generic/commandlinkbuttong.cpp b/src/generic/commandlinkbuttong.cpp
index 2895e970ce..1df2b547b6 100644
--- a/src/generic/commandlinkbuttong.cpp
+++ b/src/generic/commandlinkbuttong.cpp
@@ -24,11 +24,59 @@
 #include "wx/commandlinkbutton.h"
 #include "wx/artprov.h"
 
-#if wxUSE_EXTENDED_RTTI
-    wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCommandLinkButton, wxButton, "wx/commandlinkbutton.h")
-#else
-    wxIMPLEMENT_DYNAMIC_CLASS(wxCommandLinkButton, wxButton)
-#endif // wxUSE_EXTENDED_RTTI
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCommandLinkButton, wxButton, "wx/commandlinkbutton.h")
+
+wxDEFINE_FLAGS( wxCommandLinkButtonStyle )
+wxBEGIN_FLAGS( wxCommandLinkButtonStyle )
+// new style border flags, we put them first to
+// use them for streaming out
+wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+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)
+wxFLAGS_MEMBER(wxBORDER)
+
+// standard window styles
+wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+wxFLAGS_MEMBER(wxWANTS_CHARS)
+wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+wxFLAGS_MEMBER(wxVSCROLL)
+wxFLAGS_MEMBER(wxHSCROLL)
+
+wxFLAGS_MEMBER(wxBU_AUTODRAW)
+wxFLAGS_MEMBER(wxBU_LEFT)
+wxFLAGS_MEMBER(wxBU_RIGHT)
+wxFLAGS_MEMBER(wxBU_TOP)
+wxFLAGS_MEMBER(wxBU_BOTTOM)
+wxEND_FLAGS( wxCommandLinkButtonStyle )
+
+wxBEGIN_PROPERTIES_TABLE(wxCommandLinkButton)
+wxPROPERTY( MainLabel, wxString, SetMainLabel, GetMainLabel, wxString(), \
+           0 /*flags*/, wxT("The main label"), wxT("group") )
+
+wxPROPERTY( Note, wxString, SetNote, GetNote, wxString(), \
+           0 /*flags*/, wxT("The link URL"), wxT("group") )
+wxPROPERTY_FLAGS( WindowStyle, wxCommandLinkButtonStyle, long, SetWindowStyleFlag, \
+                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/,     \
+                 wxT("The link style"), wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxEMPTY_HANDLERS_TABLE(wxCommandLinkButton)
+
+wxCONSTRUCTOR_7( wxCommandLinkButton, wxWindow*, Parent, wxWindowID, Id, wxString, \
+                MainLabel, wxString, Note, wxPoint, Position, wxSize, Size, long, WindowStyle )
 
 // ----------------------------------------------------------------------------
 // Generic command link button