CBuilder project creation files Not appropriate for new makefiles

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

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 96a508552406ec38a6b202ef5a1c04bca570dd39..9127559181a25e239b95d88e8d1344b3880e3239 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -120,14 +120,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxRichEditModule, wxModule)
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxTextCtrl, wxControl,"wx/textctrl.h")
 
 WX_BEGIN_PROPERTIES_TABLE(wxTextCtrl)
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxTextCtrl, wxControl,"wx/textctrl.h")
 
 WX_BEGIN_PROPERTIES_TABLE(wxTextCtrl)

-       WX_PROPERTY_SET_AND_GET_BY_REF_RET_BOOL( Font , wxFont , SetFont , GetFont  , )
+       WX_PROPERTY( Font , wxFont , SetFont , GetWindowFont  , )

        WX_PROPERTY( Value , wxString , SetValue, GetValue, wxEmptyString )
 WX_END_PROPERTIES_TABLE()
 
 WX_BEGIN_HANDLERS_TABLE(wxTextCtrl)
 WX_END_HANDLERS_TABLE()
 
        WX_PROPERTY( Value , wxString , SetValue, GetValue, wxEmptyString )
 WX_END_PROPERTIES_TABLE()
 
 WX_BEGIN_HANDLERS_TABLE(wxTextCtrl)
 WX_END_HANDLERS_TABLE()
 

-WX_CONSTRUCTOR_6( wxTextCtrl , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size , long , WindowStyle) 
+WX_CONSTRUCTOR_6( wxTextCtrl , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size , long , WindowStyle)

 #else
 IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
 #endif
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
 #endif


@@ -1864,7 +1864,7 @@ bool wxTextCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             }
             return TRUE;
     }
             }
             return TRUE;
     }

-    
+

     // not processed, leave it to the base class
     return wxTextCtrlBase::MSWOnNotify(idCtrl, lParam, result);
 }
     // not processed, leave it to the base class
     return wxTextCtrlBase::MSWOnNotify(idCtrl, lParam, result);
 }