xti extensions

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/fontmap.cpp b/src/common/fontmap.cpp
index 18fc3917c2d9a5265c4d0482ad8be4cc25c397a5..c0a6fd0c5095997baa400510cc73662a6b904d8d 100644 (file)
--- a/src/common/fontmap.cpp
+++ b/src/common/fontmap.cpp
@@ -54,6 +54,61 @@
 
 #include "wx/encconv.h"
 
+#if wxUSE_EXTENDED_RTTI
+
+WX_BEGIN_ENUM( wxFontEncoding )
+       WX_ENUM_MEMBER( wxFONTENCODING_SYSTEM )
+       WX_ENUM_MEMBER( wxFONTENCODING_DEFAULT )
+
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_1 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_2 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_3 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_4 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_5 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_6 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_7 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_8 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_9 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_10 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_11 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_12 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_13 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_14 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_15 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ISO8859_MAX )
+       WX_ENUM_MEMBER( wxFONTENCODING_KOI8 )
+       WX_ENUM_MEMBER( wxFONTENCODING_ALTERNATIVE )
+       WX_ENUM_MEMBER( wxFONTENCODING_BULGARIAN )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP437 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP850 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP852 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP855 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP866 )
+
+       WX_ENUM_MEMBER( wxFONTENCODING_CP874 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP932 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP936 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP949 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP950 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP1250 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP1251 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP1252 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP1253 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP1254 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP1255 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP1256 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP1257 )
+       WX_ENUM_MEMBER( wxFONTENCODING_CP12_MAX )
+       WX_ENUM_MEMBER( wxFONTENCODING_UTF7 )
+       WX_ENUM_MEMBER( wxFONTENCODING_UTF8 )
+       WX_ENUM_MEMBER( wxFONTENCODING_GB2312 )
+       WX_ENUM_MEMBER( wxFONTENCODING_BIG5 )
+       WX_ENUM_MEMBER( wxFONTENCODING_SHIFT_JIS )
+       WX_ENUM_MEMBER( wxFONTENCODING_EUC_JP )
+       WX_ENUM_MEMBER( wxFONTENCODING_UNICODE )
+WX_END_ENUM( wxFontEncoding )
+#endif
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 2c5530169c48ca3a33527c7a07710f5e82d71482..b66a33ab71300e23f20912c5b6634b5378391465 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -53,19 +53,21 @@
 
 #if wxUSE_EXTENDED_RTTI
 const wxClassInfo* wxObject::sm_classParentswxObject[] = { NULL } ; 
- wxObject* wxVariantToObjectConverterwxObject ( const wxxVariant &data ) 
+ wxObject* wxVariantToObjectConverterwxObject ( wxxVariant &data ) 
 { return data.Get<wxObject*>() ; } 
+ wxObject* wxVariantOfPtrToObjectConverterwxObject ( wxxVariant &data ) 
+{ return &data.Get<wxObject>() ; } 
  wxxVariant wxObjectToVariantConverterwxObject ( wxObject *data ) 
  { return wxxVariant( dynamic_cast<wxObject*> (data)  ) ; }
  wxClassInfo wxObject::sm_classwxObject(sm_classParentswxObject , wxT("") , wxT("wxObject"),   
             (int) sizeof(wxObject),                              \
             (wxObjectConstructorFn) 0   ,   
                        (wxPropertyInfo*) NULL,(wxHandlerInfo*) NULL,0 , 0 ,     
-                       0 , wxVariantToObjectConverterwxObject , wxObjectToVariantConverterwxObject);    
+                       0 , wxVariantOfPtrToObjectConverterwxObject , wxVariantToObjectConverterwxObject , wxObjectToVariantConverterwxObject);    
  template<> void wxStringReadValue(const wxString & , wxObject * & ){assert(0) ;}
  template<> void wxStringWriteValue(wxString & , wxObject* const & ){assert(0) ;}
  template<> const wxTypeInfo* wxGetTypeInfo( wxObject ** )
- { static wxClassTypeInfo s_typeInfo(&wxObject::sm_classwxObject) ; return &s_typeInfo ; }
+ { static wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &wxObject::sm_classwxObject) ; return &s_typeInfo ; }
 #else
 wxClassInfo wxObject::sm_classwxObject( wxT("wxObject"), 0, 0,
                                         (int) sizeof(wxObject),

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 3650a7b5b7b0ae49ce9f6648817e775725df3040..87b68bee7606b5eb69e0db37d9ff06ebe2524806 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -43,7 +43,38 @@ IMPLEMENT_CLASS(wxNotebookSizer, wxSizer)
 
 WX_DEFINE_EXPORTED_LIST( wxSizerItemList );
 
-
+/*
+       TODO PROPERTIES
+         sizeritem
+           object
+               object_ref
+                 minsize
+                 option
+                 flag
+                 border
+     spacer
+               option
+               flag
+               borfder
+       boxsizer
+          orient
+    staticboxsizer
+          orient
+          label
+       gridsizer
+          rows
+          cols
+          vgap
+          hgap
+       flexgridsizer
+          rows
+          cols
+          vgap
+          hgap
+          growablerows
+          growablecols
+    minsize
+*/
 //---------------------------------------------------------------------------
 // wxSizerItem
 //---------------------------------------------------------------------------

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 151ad018872d2c9b262a123f9d674a8b79819f5f..2d3ad5a929a1b6b4210126ba8d7e6e3fc2d9d53b 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -430,6 +430,13 @@ bool wxDirItemData::HasFiles(const wxString& WXUNUSED(spec)) const
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericDirCtrl, wxControl)
 
+/*
+TODO PROPERTIES
+       defaultfolder string
+       filter string
+       (long) defaultfilter)
+*/
+
 BEGIN_EVENT_TABLE(wxGenericDirCtrl, wxControl)
   EVT_TREE_ITEM_EXPANDING     (-1, wxGenericDirCtrl::OnExpandItem)
   EVT_TREE_ITEM_COLLAPSED     (-1, wxGenericDirCtrl::OnCollapseItem)

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 3bc06cc3be518f7e55a6174c6fa5474dbc68fb7a..e7d762317b8d0b59b571a02629663d1b68bf98e3 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -47,6 +47,7 @@
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxPanel, wxWindow,"wx/panel.h")
 
 WX_BEGIN_PROPERTIES_TABLE(wxPanel)
+// style wxTAB_TRAVERSAL
 WX_END_PROPERTIES_TABLE()
 
 WX_BEGIN_HANDLERS_TABLE(wxPanel)

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index a138011f0e4a56f2cc5951310b2dabd413965fb8..726b6c1935ea427e31e7ee57af845511bd908c12 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -61,6 +61,11 @@
 
 IMPLEMENT_CLASS(wxScrolledWindow, wxGenericScrolledWindow)
 
+/*
+       TODO PROPERTIES
+               style wxHSCROLL | wxVSCROLL
+*/
+
 // ----------------------------------------------------------------------------
 // wxScrollHelperEvtHandler: intercept the events from the window and forward
 // them to wxScrollHelper

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index a0e85324980a17aaaeff7c178534a7a3d575042c..46e4c888f57ed9e1fae02af179d1ec07a49bf0fe 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -48,6 +48,16 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_UNSPLIT)
 
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow)
+
+/*
+       TODO PROPERTIES
+               style wxSP_3D
+               sashpos (long , 0 )
+               minsize (long -1 )
+               object, object_ref
+               orientation
+*/
+
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterEvent, wxNotifyEvent)
 
 BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow)

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index 988d7bcf874805910b879168be7a8cd4fec8cd5a..329399e221eb69f9d4735119ca5c6f1122cd09d1 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/src/generic/wizard.cpp
@@ -93,6 +93,14 @@ BEGIN_EVENT_TABLE(wxWizard, wxDialog)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxWizard, wxDialog)
+
+/*
+       TODO PROPERTIES :
+       wxWizard
+               extstyle
+               title
+*/
+
 IMPLEMENT_ABSTRACT_CLASS(wxWizardPage, wxPanel)
 IMPLEMENT_DYNAMIC_CLASS(wxWizardPageSimple, wxWizardPage)
 IMPLEMENT_DYNAMIC_CLASS(wxWizardEvent, wxNotifyEvent)

diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp
index c249267f04bc8d1e1fd9daf5d2f40639c98fab2d..7ff6769e77e30a2684e72fac5d0af605a0fe755c 100644 (file)
--- a/src/msw/bmpbuttn.cpp
+++ b/src/msw/bmpbuttn.cpp
@@ -32,6 +32,16 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 
+/*
+TODO PROPERTIES :
+
+long "style" , wxBU_AUTODRAW
+bool "default" , 0
+bitmap "selected" ,
+bitmap "focus" ,
+bitmap "disabled" ,
+*/
+
 #define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
 
 bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index 4e93fe7cd8c115d4ed4199fd7fd6cc44c6ea2790..34b8445f006632c36b82d395e7f23c3131adede0 100644 (file)
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -51,6 +51,7 @@ IMPLEMENT_DYNAMIC_CLASS_XTI(wxButton, wxControl,"wx/button.h")
 
 WX_BEGIN_PROPERTIES_TABLE(wxButton)
        WX_DELEGATE( OnClick , wxEVT_COMMAND_BUTTON_CLICKED , wxCommandEvent )
+       // default
 WX_END_PROPERTIES_TABLE()
 
 WX_BEGIN_HANDLERS_TABLE(wxButton)

diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp
index 8dfdd9fd0ed2dc6547409d6f7634b177ffaf6130..dfc0c6baad5b949193a563218f9bd8322454f05e 100644 (file)
--- a/src/msw/checkbox.cpp
+++ b/src/msw/checkbox.cpp
@@ -49,6 +49,12 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 
+/*
+TODO PROPERTIES :
+
+bool "checked" , 0
+*/
+
 // ----------------------------------------------------------------------------
 // wxCheckBox
 // ----------------------------------------------------------------------------

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index df2f156ce3d11d98945b89a638b41d538ecab4e8..90bf234dc17cddf6739761fb595cb00e58897f90 100644 (file)
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -69,6 +69,11 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
 
+/*
+TODO PROPERTIES
+       list content
+               item , checked (no)
+*/
 // ----------------------------------------------------------------------------
 // declaration and implementation of wxCheckListBoxItem class
 // ----------------------------------------------------------------------------

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index f9629adaabf847fb8bd65cf7795076d0f033a700..57631408b6fc59f4234b49c27147462a22f94257 100644 (file)
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -42,6 +42,13 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 
+/*
+       TODO PROPERTIES
+               selection (long)
+               content (list)
+                       item
+*/
+
 // ============================================================================
 // implementation
 // ============================================================================

diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp
index b41790d4dfa9015f25130ebd4d161b4162d1e062..7ea51be97c4de8ecca1e288edfaadba05a638bbb 100644 (file)
--- a/src/msw/colour.cpp
+++ b/src/msw/colour.cpp
@@ -25,7 +25,22 @@
 
 #include <string.h>
 
+#if wxUSE_EXTENDED_RTTI
+IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI( wxColour , wxObject , "wx/colour.h" ) 
+
+WX_BEGIN_PROPERTIES_TABLE(wxColour)
+       WX_READONLY_PROPERTY( Red, unsigned char , Red , 0 )
+       WX_READONLY_PROPERTY( Green, unsigned char  , Green , 0 ) 
+       WX_READONLY_PROPERTY( Blue, unsigned char , Blue , 0 )
+WX_END_PROPERTIES_TABLE()
+
+WX_CONSTRUCTOR_3( wxColour , unsigned char , Red , unsigned char , Green , unsigned char , Blue )  
+
+WX_BEGIN_HANDLERS_TABLE(wxColour)
+WX_END_HANDLERS_TABLE()
+#else
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
+#endif
 
 // Colour
 

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index e296bf6ca6a536ffb6a94a69f6042d297dc89db2..402acea13e1cf2441e293ec1e7f5e604c6b96e66 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -55,6 +55,14 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 
+/* 
+       TODO PROPERTIES
+               selection (long¨)
+               content
+                       value
+                       item
+*/
+
 // ----------------------------------------------------------------------------
 // function prototypes
 // ----------------------------------------------------------------------------

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 8c5390cc5ce90cc695ba1a4ece89686352ebb382..c26ab6806241420f9859d71861f632ff338bf4cc 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -70,6 +70,13 @@ static wxWindowList wxModalDialogs;
 
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 
+/*
+       TODO PROPERTIES
+
+               style (wxDEFAULT_DIALOG_STYLE)
+               centered (bool, false )
+*/
+
 BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
     EVT_BUTTON(wxID_OK, wxDialog::OnOK)
     EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index db290f03620eaab8487f1164804832056b84c1fe..ad1c6ae5b34a9de297882b63cf6c0f9947e7f546 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -44,7 +44,51 @@
 
 #include "wx/tokenzr.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
+#if wxUSE_EXTENDED_RTTI
+
+WX_BEGIN_ENUM( wxFontFamily )
+       WX_ENUM_MEMBER( wxDEFAULT )
+       WX_ENUM_MEMBER( wxDECORATIVE )
+       WX_ENUM_MEMBER( wxROMAN )
+       WX_ENUM_MEMBER( wxSCRIPT )
+       WX_ENUM_MEMBER( wxSWISS )
+       WX_ENUM_MEMBER( wxMODERN )
+       WX_ENUM_MEMBER( wxTELETYPE )
+WX_END_ENUM( wxFontFamily )
+
+WX_BEGIN_ENUM( wxFontStyle )
+       WX_ENUM_MEMBER( wxNORMAL )
+       WX_ENUM_MEMBER( wxITALIC )
+       WX_ENUM_MEMBER( wxSLANT )
+WX_END_ENUM( wxFontStyle )
+
+WX_BEGIN_ENUM( wxFontWeight )
+       WX_ENUM_MEMBER( wxNORMAL )
+       WX_ENUM_MEMBER( wxLIGHT )
+       WX_ENUM_MEMBER( wxBOLD )
+WX_END_ENUM( wxFontWeight )
+
+IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI(wxFont, wxGDIObject,"wx/font.h")
+
+WX_BEGIN_PROPERTIES_TABLE(wxFont)
+       WX_PROPERTY( Size,int, SetPointSize, GetPointSize, 12 )
+       WX_PROPERTY( Family, int  , SetFamily, GetFamily, (int)wxDEFAULT ) // wxFontFamily
+       WX_PROPERTY( Style, int , SetStyle, GetStyle, (int)wxNORMAL ) // wxFontStyle
+       WX_PROPERTY( Weight, int , SetWeight, GetWeight, (int)wxNORMAL ) // wxFontWeight
+       WX_PROPERTY( Underlined, bool , SetUnderlined, GetUnderlined, false )
+       WX_PROPERTY_SET_BY_REF( Face, wxString , SetFaceName, GetFaceName, )
+       WX_PROPERTY( Encoding, wxFontEncoding , SetEncoding, GetEncoding, wxFONTENCODING_DEFAULT )
+WX_END_PROPERTIES_TABLE()
+
+WX_CONSTRUCTOR_6( wxFont , int , Size , int , Family , int , Style , int , Weight , bool , Underlined , wxString , Face )  
+
+WX_BEGIN_HANDLERS_TABLE(wxFont)
+WX_END_HANDLERS_TABLE()
+
+#else
+       IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
+#endif
+
 
 // ----------------------------------------------------------------------------
 // constants

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 62e85fbec7b6e3f88b5f8fae227bec6c4f728d15..96f74340eaa5c215947dcf2b9081f9f7f2211e7e 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -83,6 +83,12 @@ END_EVENT_TABLE()
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxFrame, wxTopLevelWindow,"wx/frame.h")
 
 WX_BEGIN_PROPERTIES_TABLE(wxFrame)
+/*
+       TODO PROPERTIES
+
+               style (wxDEFAULT_FRAME_STYLE)
+               centered (bool, false )
+*/
 WX_END_PROPERTIES_TABLE()
 
 WX_BEGIN_HANDLERS_TABLE(wxFrame)

diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp
index 7df84ca373ef2aaf0e231bc7f79c95f6cb45435a..fa515196ac4d1771c38aeb7118cc555f320b3fae 100644 (file)
--- a/src/msw/gauge95.cpp
+++ b/src/msw/gauge95.cpp
@@ -68,6 +68,14 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxGauge95, wxControl)
 
+/*
+       TODO PROPERTIES
+               range (long)
+               value (long)
+               shadow (ShadowWidth)
+               bezel (BezelFace)
+*/
+
 // ============================================================================
 // implementation
 // ============================================================================

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index 247ae933c8c29825ff5bbafcee5bb81810a5c2a9..f54a04bd96ee9f2d8bbdd203cc626f001c005b56 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -49,6 +49,13 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
+/*
+TODO PROPERTIES
+       selection
+       content
+               item
+*/
+
 // ============================================================================
 // list box item declaration and implementation
 // ============================================================================

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index ca6ab1b99c178c8fd86ddd7706ca2d7ec36d73ca..5b60b5d6a395ebadbcf103a12d7c092056ed2757 100644 (file)
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -115,6 +115,23 @@ UINT GetMenuState(HMENU hMenu, UINT id, UINT flags)
 IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxWindow)
 
+/*
+       TODO PROPERTIES
+               wxMenu
+                       label
+                       help
+
+               separator
+               break
+               label
+               accel
+               radio
+               checkable
+               help
+               bitmap
+               wxMenuItem
+*/
+
 // ---------------------------------------------------------------------------
 // wxMenu construction, adding and removing menu items
 // ---------------------------------------------------------------------------

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 9f8021bf01355a3a97e5e4a19838ecea4a3170e1..cb9d37a5736c46c47bb176ea1256a360fc5c3f0b 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -68,6 +68,16 @@
 #include "wx/panel.h"
 #endif
 
+/*
+       notebookpage
+               object
+               object_ref
+               label
+               selected
+               style
+               usenotebooksizer
+*/
+
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index bbb4333cf92b7333ad0d8cd7e004247967481cd4..39e4d068f641cc2f808e4ea05fd7c076665531a8 100644 (file)
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -49,6 +49,14 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 
+/*
+       selection
+       content
+               label
+               dimension
+               item
+*/
+
 // there are two possible ways to create the radio buttons: either as children
 // of the radiobox or as siblings of it - allow playing with both variants for
 // now, eventually we will choose the best one for our purposes

diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp
index 4cff6cf1e3e1af2ada229bf821fc8f7386d9dd64..4b51cbc2d8179db4cdff15129900b5631441dbe0 100644 (file)
--- a/src/msw/radiobut.cpp
+++ b/src/msw/radiobut.cpp
@@ -49,6 +49,13 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 
+/*
+       TODO PROPERTIES
+
+               label
+               value (bool , 0 )
+*/
+
 void wxRadioButton::Init()
 {
     m_focusJustSet = FALSE;

diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp
index c4fbe72399dcb96597c002d4d5fc3bcef29f6c7c..739bf843cc3aa6fa1e900b9e421f20faa086cec3 100644 (file)
--- a/src/msw/scrolbar.cpp
+++ b/src/msw/scrolbar.cpp
@@ -31,6 +31,14 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 
+/*
+       TODO PROPERTIES
+               value (long,0)
+               thumbsize(long,1)
+               range( long , 10 )
+               pagesize( long , 1)
+*/
+
 BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
 #if WXWIN_COMPATIBILITY
   EVT_SCROLL(wxScrollBar::OnScroll)

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 7afdc6357ffdee732667521d2c15dce195bef580..2f35fc9e19ddcc435034805234f8b39f159bfaab 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -39,6 +39,18 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxSlider95, wxControl)
 
+/*
+       TODO PROPERTIES
+               value wxSL_DEFAULT_VALUE
+               min wxSL_DEFAULT_MIN
+               max wxSL_DEFAULT_MAX
+               tickfreq (long , 0 )
+               pagesize ( long )
+               linesize (long)
+               thumg (long)
+               tick (long)
+               selmin / selmax (long)
+*/
 // Slider
 wxSlider95::wxSlider95()
 {

diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp
index 3547df37d00d642c3616fe617e61e4055afbc595..ff06c69136b60461fc44cd5a2a2db61a8e453e31 100644 (file)
--- a/src/msw/spinbutt.cpp
+++ b/src/msw/spinbutt.cpp
@@ -57,6 +57,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
 
+/*
+       TODO PROPERTIES
+
+               style wxSP_VERTICAL | wxSP_ARROW_KEYS
+               value wxSP_DEFAULT_VALUE
+               min wxSP_DEFAULT_MIN
+               max wxSP_DEFAULT_MAX
+
+*/
+
 // ----------------------------------------------------------------------------
 // wxSpinButton
 // ----------------------------------------------------------------------------

diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index 406afce6299df784f82133991ad0002a8d1d8566..c1aa0182d7570f45d19afd4617cbdc4e6e1fa610 100644 (file)
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -52,6 +52,15 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
 
+/*
+       TODO PROPERTIES
+               style wxSP_ARROW_KEYS
+               value wxSP_DEFAULT_VALUE
+               min wxSP_DEFAULT_MIN
+               max wxSP_DEFAULT_MAX
+
+*/
+
 BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
     EVT_CHAR(wxSpinCtrl::OnChar)
 

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index 07f6dfe1a9cb6ee30a8b148d1f7f754771400b78..604f6be4e0bc7bf34c5265f6cf0540b5ee6035bd 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -46,6 +46,11 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 
+/*
+       TODO PROPERTIES :
+               bitmap
+*/
+
 // ===========================================================================
 // implementation
 // ===========================================================================

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 2689d61fc99f8213da107669bc2c9d8575e8856e..6c89c3d1d74ec8d942649a249ca0163dee1f6c47 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -44,6 +44,10 @@
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
+/*
+       TODO PROPERTIES :
+               label
+*/
 
 // ============================================================================
 // implementation

diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp
index 510292b1517c2098806c94c6a38c969edc19b00b..a86e0ad0a6eb686c18b5e59fc0917ed813ed0070 100644 (file)
--- a/src/msw/statline.cpp
+++ b/src/msw/statline.cpp
@@ -47,6 +47,10 @@
 // ============================================================================
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
+/*
+       TODO PROPERTIES :
+               style (wxLI_HORIZONTAL)
+*/
 
 // ----------------------------------------------------------------------------
 // wxStaticLine

diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp
index 5bfc2f0e92224aed8dd8ae906cd16368d5831eb1..4c2521c468f3a4ff8b6eccf3b0434daf82499aaf 100644 (file)
--- a/src/msw/stattext.cpp
+++ b/src/msw/stattext.cpp
@@ -33,6 +33,10 @@
 #include <stdio.h>
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
+/*
+       TODO PROPERTIES :
+               label
+*/
 
 bool wxStaticText::Create(wxWindow *parent,
                           wxWindowID id,

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 7276787ba478f59d4f6de15392da4278d90eaf51..94305d7af8e8c5b352177cd90e902f8c339c127f 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -109,6 +109,25 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
 
+/*
+       TOOLBAR PROPERTIES
+               tool
+                       bitmap
+                       bitmap2
+                       tooltip
+                       longhelp
+                       radio (bool)
+                       toggle (bool)
+               separator
+               style ( wxNO_BORDER | wxTB_HORIZONTAL)
+               bitmapsize
+               margins
+               packing
+               separation
+
+               dontattachtoframe
+*/
+
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)
     EVT_SYS_COLOUR_CHANGED(wxToolBar::OnSysColourChanged)

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 9951c9ba36b80315d6375ea6cc1f03826a2171dc..1a4228d9a416cb81784da7af045c94511967e9a7 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -117,6 +117,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxRichEditModule, wxModule)
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
+/*
+       TODO PROPERTIES :
+               value
+*/
 
 BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
     EVT_CHAR(wxTextCtrl::OnChar)

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index c5d1f8275bcec1713f0e421328823f8cfcfe37b6..c8efb9e912c567612aaa047e45b34b97ac519850 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -233,12 +233,26 @@ static inline void wxBringWindowToTop(HWND hwnd)
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxWindow, wxWindowBase,"wx/window.h")
 
 WX_BEGIN_PROPERTIES_TABLE(wxWindow)
+       // WX_DEFAULT_CHILD_PARENT_RELATION( Parent , Children ) ;
        WX_READONLY_PROPERTY( Parent,wxWindow*, GetParent,  )
        WX_PROPERTY( Id,wxWindowID, SetId, GetId, -1 )
+       // MaxHeight, Width , MinHeight , Width
+       // TODO switch label to control and title to toplevels
        WX_PROPERTY_SET_BY_REF( Title,wxString, SetTitle, GetTitle, wxT("") )
        WX_PROPERTY_SET_BY_REF( Label,wxString, SetLabel, GetLabel, wxT("") )
-       WX_PROPERTY_SET_BY_REF( Position,wxPoint, SetPosition , GetPosition, wxDefaultPosition )
-       WX_PROPERTY_SET_BY_REF( Size,wxSize, SetSize, GetSize, wxDefaultSize )
+       WX_PROPERTY_SET_BY_REF( Position,wxPoint, SetPosition , GetPosition, wxPoint(-1,-1) ) // pos
+       WX_PROPERTY_SET_BY_REF( Size,wxSize, SetSize, GetSize, wxSize(-1,-1) ) // size
+       WX_PROPERTY( WindowStyle , long , SetWindowStyle , GetWindowStyle , ) // style 
+       WX_PROPERTY( ExtraStyle , long , SetExtraStyle , GetExtraStyle , ) // extstyle
+       WX_PROPERTY( ThemeEnabled , bool , SetThemeEnabled , GetThemeEnabled , )
+       WX_PROPERTY_SET_BY_REF_RET_BOOL( BackgroundColour , wxColour , SetBackgroundColour , GetBackgroundColour , ) // bg
+       WX_PROPERTY_SET_BY_REF_RET_BOOL( ForegroundColour , wxColour , SetForegroundColour , GetForegroundColour , ) // fg
+       //WX_PROPERTY_SET_BY_REF( Cursor , wxCursor , SetCursor , GetCursor , )
+       WX_PROPERTY_SET_AND_GET_BY_REF_RET_BOOL( Font , wxFont , SetFont , GetFont  , )
+       // WX_PROPERTY( ToolTip , wxString , SetToolTip , GetToolTipText , )
+       WX_PROPERTY( AutoLayout , bool , SetAutoLayout , GetAutoLayout , )
+       WX_PROPERTY_SET_RET_BOOL( Enabled , bool , Enable , IsEnabled , wxxVariant((bool)true) )
+       WX_PROPERTY_SET_RET_BOOL( Shown , bool , Show , IsShown , wxxVariant((bool)true) )
 WX_END_PROPERTIES_TABLE()
 
 WX_BEGIN_HANDLERS_TABLE(wxWindow)