Committing in .

[wxWidgets.git] / src / common / wincmn.cpp

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 20e32b7e83c5f832c3a669e069f5f31adfec3207..a9f702acfd5302368338b0a670741d31e061be9d 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -37,6 +37,7 @@
     #include "wx/window.h"
     #include "wx/checkbox.h"
     #include "wx/radiobut.h"
     #include "wx/window.h"
     #include "wx/checkbox.h"
     #include "wx/radiobut.h"

+    #include "wx/textctrl.h"

     #include "wx/settings.h"
     #include "wx/dialog.h"
 #endif //WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/dialog.h"
 #endif //WX_PRECOMP


@@ -118,8 +119,11 @@ void wxWindowBase::InitBase()
 
     m_backgroundColour = settings.GetSystemColour(wxSYS_COLOUR_BTNFACE);
     m_foregroundColour = *wxBLACK;  // TODO take this from sys settings too?
 
     m_backgroundColour = settings.GetSystemColour(wxSYS_COLOUR_BTNFACE);
     m_foregroundColour = *wxBLACK;  // TODO take this from sys settings too?

+#ifndef __WXMAC__

     m_font = *wxSWISS_FONT;         //      and this?
     m_font = *wxSWISS_FONT;         //      and this?

-
+#else
+       m_font = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+#endif

     // no style bits
     m_windowStyle = 0;
 
     // no style bits
     m_windowStyle = 0;
 


@@ -154,13 +158,19 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
                               const wxPoint& WXUNUSED(pos),
                               const wxSize& WXUNUSED(size),
                               long style,
                               const wxPoint& WXUNUSED(pos),
                               const wxSize& WXUNUSED(size),
                               long style,

+#if wxUSE_VALIDATORS
+#  if defined(__VISAGECPP__)
+                              const wxValidator* validator,
+#  else

                               const wxValidator& validator,
                               const wxValidator& validator,

+#  endif
+#endif

                               const wxString& name)
 {
     // m_isWindow is set to TRUE in wxWindowBase::Init() as well as many other
     // member variables - check that it has been called (will catch the case
     // when a new ctor is added which doesn't call InitWindow)
                               const wxString& name)
 {
     // m_isWindow is set to TRUE in wxWindowBase::Init() as well as many other
     // member variables - check that it has been called (will catch the case
     // when a new ctor is added which doesn't call InitWindow)

-    wxASSERT_MSG( m_isWindow, T("Init() must have been called before!") );
+    wxASSERT_MSG( m_isWindow, wxT("Init() must have been called before!") );

 
     // generate a new id if the user doesn't care about it
     m_windowId = id == -1 ? NewControlId() : id;
 
     // generate a new id if the user doesn't care about it
     m_windowId = id == -1 ? NewControlId() : id;


@@ -191,7 +201,7 @@ wxWindowBase::~wxWindowBase()
     // we weren't a dialog class
     wxTopLevelWindows.DeleteObject(this);
 
     // we weren't a dialog class
     wxTopLevelWindows.DeleteObject(this);
 

-    wxASSERT_MSG( GetChildren().GetCount() == 0, T("children not destroyed") );
+    wxASSERT_MSG( GetChildren().GetCount() == 0, wxT("children not destroyed") );

 
     // make sure that there are no dangling pointers left pointing to us
     wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
 
     // make sure that there are no dangling pointers left pointing to us
     wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);


@@ -280,12 +290,12 @@ bool wxWindowBase::DestroyChildren()
 
         wxWindow *child = node->GetData();
 
 
         wxWindow *child = node->GetData();
 

-        wxASSERT_MSG( child, T("children list contains empty nodes") );
+        wxASSERT_MSG( child, wxT("children list contains empty nodes") );

 
         delete child;
 
         wxASSERT_MSG( !GetChildren().Find(child),
 
         delete child;
 
         wxASSERT_MSG( !GetChildren().Find(child),

-                      T("child didn't remove itself using RemoveChild()") );
+                      wxT("child didn't remove itself using RemoveChild()") );

     }
 
     return TRUE;
     }
 
     return TRUE;


@@ -335,7 +345,7 @@ void wxWindowBase::Centre(int direction)
     if ( !(direction & wxCENTRE_ON_SCREEN) || wxDynamicCast(this, wxControl) )
     {
         // theo nly chance to get this is to have a wxControl without parent
     if ( !(direction & wxCENTRE_ON_SCREEN) || wxDynamicCast(this, wxControl) )
     {
         // theo nly chance to get this is to have a wxControl without parent

-        wxCHECK_RET( parent, T("a control must have a parent") );
+        wxCHECK_RET( parent, wxT("a control must have a parent") );

 
         // adjust to the parents client area origin
         wxPoint posParent = parent->ClientToScreen(wxPoint(0, 0));
 
         // adjust to the parents client area origin
         wxPoint posParent = parent->ClientToScreen(wxPoint(0, 0));


@@ -427,7 +437,7 @@ bool wxWindowBase::Enable(bool enable)
 
 bool wxWindowBase::IsTopLevel() const
 {
 
 bool wxWindowBase::IsTopLevel() const
 {

-    return wxDynamicCast(this, wxFrame) || wxDynamicCast(this, wxDialog);
+    return FALSE;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -436,7 +446,7 @@ bool wxWindowBase::IsTopLevel() const
 
 void wxWindowBase::AddChild(wxWindowBase *child)
 {
 
 void wxWindowBase::AddChild(wxWindowBase *child)
 {

-    wxCHECK_RET( child, T("can't add a NULL child") );
+    wxCHECK_RET( child, wxT("can't add a NULL child") );

 
     GetChildren().Append(child);
     child->SetParent(this);
 
     GetChildren().Append(child);
     child->SetParent(this);


@@ -444,7 +454,7 @@ void wxWindowBase::AddChild(wxWindowBase *child)
 
 void wxWindowBase::RemoveChild(wxWindowBase *child)
 {
 
 void wxWindowBase::RemoveChild(wxWindowBase *child)
 {

-    wxCHECK_RET( child, T("can't remove a NULL child") );
+    wxCHECK_RET( child, wxT("can't remove a NULL child") );

 
     GetChildren().DeleteObject(child);
     child->SetParent((wxWindow *)NULL);
 
     GetChildren().DeleteObject(child);
     child->SetParent((wxWindow *)NULL);


@@ -579,7 +589,7 @@ void wxWindowBase::SetCaret(wxCaret *caret)
     if ( m_caret )
     {
         wxASSERT_MSG( m_caret->GetWindow() == this,
     if ( m_caret )
     {
         wxASSERT_MSG( m_caret->GetWindow() == this,

-                      T("caret should be created associated to this window") );
+                      wxT("caret should be created associated to this window") );

     }
 }
 #endif // wxUSE_CARET
     }
 }
 #endif // wxUSE_CARET


@@ -589,6 +599,18 @@ void wxWindowBase::SetCaret(wxCaret *caret)
 // validators
 // ----------------------------------------------------------------------------
 
 // validators
 // ----------------------------------------------------------------------------
 

+#  if defined(__VISAGECPP__)
+void wxWindowBase::SetValidator(const wxValidator* validator)
+{
+    if ( m_windowValidator )
+        delete m_windowValidator;
+
+    m_windowValidator = (wxValidator *)validator->Clone();
+
+    if ( m_windowValidator )
+        m_windowValidator->SetWindow(this) ;
+}
+#  else

 void wxWindowBase::SetValidator(const wxValidator& validator)
 {
     if ( m_windowValidator )
 void wxWindowBase::SetValidator(const wxValidator& validator)
 {
     if ( m_windowValidator )


@@ -599,6 +621,7 @@ void wxWindowBase::SetValidator(const wxValidator& validator)
     if ( m_windowValidator )
         m_windowValidator->SetWindow(this) ;
 }
     if ( m_windowValidator )
         m_windowValidator->SetWindow(this) ;
 }

+#  endif // __VISAGECPP__

 #endif // wxUSE_VALIDATORS
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_VALIDATORS
 
 // ----------------------------------------------------------------------------


@@ -895,14 +918,14 @@ bool wxWindowBase::Layout()
 {
     int w, h;
     GetClientSize(&w, &h);
 {
     int w, h;
     GetClientSize(&w, &h);

-    
+

     // If there is a sizer, use it instead of the constraints
     if ( GetSizer() )
     {
         GetSizer()->SetDimension( 0, 0, w, h );
         return TRUE;
     }
     // If there is a sizer, use it instead of the constraints
     if ( GetSizer() )
     {
         GetSizer()->SetDimension( 0, 0, w, h );
         return TRUE;
     }

-    
+

     if ( GetConstraints() )
     {
         GetConstraints()->width.SetValue(w);
     if ( GetConstraints() )
     {
         GetConstraints()->width.SetValue(w);


@@ -914,7 +937,7 @@ bool wxWindowBase::Layout()
     DoPhase(1);           // Just one phase need if no sizers involved
     DoPhase(2);
     SetConstraintSizes(); // Recursively set the real window sizes
     DoPhase(1);           // Just one phase need if no sizers involved
     DoPhase(2);
     SetConstraintSizes(); // Recursively set the real window sizes

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -1038,18 +1061,18 @@ void wxWindowBase::SetConstraintSizes(bool recurse)
         wxChar *windowClass = GetClassInfo()->GetClassName();
 
         wxString winName;
         wxChar *windowClass = GetClassInfo()->GetClassName();
 
         wxString winName;

-        if ( GetName() == T("") )
-            winName = T("unnamed");
+        if ( GetName() == wxT("") )
+            winName = wxT("unnamed");

         else
             winName = GetName();
         else
             winName = GetName();

-        wxLogDebug( T("Constraint(s) not satisfied for window of type %s, name %s:\n"),
+        wxLogDebug( wxT("Constraint(s) not satisfied for window of type %s, name %s:\n"),

                 (const wxChar *)windowClass,
                 (const wxChar *)winName);
                 (const wxChar *)windowClass,
                 (const wxChar *)winName);

-        if ( !constr->left.GetDone()) wxLogDebug( T("  unsatisfied 'left' constraint.\n")  );
-        if ( !constr->right.GetDone()) wxLogDebug( T("  unsatisfied 'right' constraint.\n")  );
-        if ( !constr->width.GetDone()) wxLogDebug( T("  unsatisfied 'width' constraint.\n")  );
-        if ( !constr->height.GetDone())  wxLogDebug( T("  unsatisfied 'height' constraint.\n")  );
-        wxLogDebug( T("Please check constraints: try adding AsIs() constraints.\n") );
+        if ( !constr->left.GetDone()) wxLogDebug( wxT("  unsatisfied 'left' constraint.\n")  );
+        if ( !constr->right.GetDone()) wxLogDebug( wxT("  unsatisfied 'right' constraint.\n")  );
+        if ( !constr->width.GetDone()) wxLogDebug( wxT("  unsatisfied 'width' constraint.\n")  );
+        if ( !constr->height.GetDone())  wxLogDebug( wxT("  unsatisfied 'height' constraint.\n")  );
+        wxLogDebug( wxT("Please check constraints: try adding AsIs() constraints.\n") );

     }
 
     if ( recurse )
     }
 
     if ( recurse )


@@ -1160,42 +1183,44 @@ void wxWindowBase::GetPositionConstraint(int *x, int *y) const
 // of control classes.
 void wxWindowBase::UpdateWindowUI()
 {
 // of control classes.
 void wxWindowBase::UpdateWindowUI()
 {

-    wxWindowID id = GetId();
-    if ( id > 0 )
+    wxUpdateUIEvent event(GetId());
+    event.m_eventObject = this;
+
+    if ( GetEventHandler()->ProcessEvent(event) )

     {
     {

-        wxUpdateUIEvent event(id);
-        event.m_eventObject = this;
+        if ( event.GetSetEnabled() )
+            Enable(event.GetEnabled());

 
 

-        if ( GetEventHandler()->ProcessEvent(event) )
+        if ( event.GetSetText() )

         {
         {

-            if ( event.GetSetEnabled() )
-                Enable(event.GetEnabled());
-
-            if ( event.GetSetText() )
+            wxControl *control = wxDynamicCast(this, wxControl);
+            if ( control )

             {
             {

-                wxControl *control = wxDynamicCast(this, wxControl);
-                if ( control )
+                wxTextCtrl *text = wxDynamicCast(control, wxTextCtrl);
+                if ( text )
+                    text->SetValue(event.GetText());
+                else

                     control->SetLabel(event.GetText());
             }
                     control->SetLabel(event.GetText());
             }

+        }

 
 #if wxUSE_CHECKBOX
 
 #if wxUSE_CHECKBOX

-            wxCheckBox *checkbox = wxDynamicCast(this, wxCheckBox);
-            if ( checkbox )
-            {
-                if ( event.GetSetChecked() )
-                    checkbox->SetValue(event.GetChecked());
-            }
+        wxCheckBox *checkbox = wxDynamicCast(this, wxCheckBox);
+        if ( checkbox )
+        {
+            if ( event.GetSetChecked() )
+                checkbox->SetValue(event.GetChecked());
+        }

 #endif // wxUSE_CHECKBOX
 
 #if wxUSE_RADIOBUTTON
 #endif // wxUSE_CHECKBOX
 
 #if wxUSE_RADIOBUTTON

-            wxRadioButton *radiobtn = wxDynamicCast(this, wxRadioButton);
-            if ( radiobtn )
-            {
-                if ( event.GetSetChecked() )
-                    radiobtn->SetValue(event.GetChecked());
-            }
-#endif // wxUSE_RADIOBUTTON
+        wxRadioButton *radiobtn = wxDynamicCast(this, wxRadioButton);
+        if ( radiobtn )
+        {
+            if ( event.GetSetChecked() )
+                radiobtn->SetValue(event.GetChecked());

         }
         }

+#endif // wxUSE_RADIOBUTTON

     }
 }
 
     }
 }
 


@@ -1236,7 +1261,7 @@ wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt)
 void wxWindowBase::DoSetClientObject( wxClientData *data )
 {
     wxASSERT_MSG( m_clientDataType != ClientData_Void,
 void wxWindowBase::DoSetClientObject( wxClientData *data )
 {
     wxASSERT_MSG( m_clientDataType != ClientData_Void,

-                  T("can't have both object and void client data") );
+                  wxT("can't have both object and void client data") );

 
     if ( m_clientObject )
         delete m_clientObject;
 
     if ( m_clientObject )
         delete m_clientObject;


@@ -1248,7 +1273,7 @@ void wxWindowBase::DoSetClientObject( wxClientData *data )
 wxClientData *wxWindowBase::DoGetClientObject() const
 {
     wxASSERT_MSG( m_clientDataType == ClientData_Object,
 wxClientData *wxWindowBase::DoGetClientObject() const
 {
     wxASSERT_MSG( m_clientDataType == ClientData_Object,

-                  T("this window doesn't have object client data") );
+                  wxT("this window doesn't have object client data") );

 
     return m_clientObject;
 }
 
     return m_clientObject;
 }


@@ -1256,7 +1281,7 @@ wxClientData *wxWindowBase::DoGetClientObject() const
 void wxWindowBase::DoSetClientData( void *data )
 {
     wxASSERT_MSG( m_clientDataType != ClientData_Object,
 void wxWindowBase::DoSetClientData( void *data )
 {
     wxASSERT_MSG( m_clientDataType != ClientData_Object,

-                  T("can't have both object and void client data") );
+                  wxT("can't have both object and void client data") );

 
     m_clientData = data;
     m_clientDataType = ClientData_Void;
 
     m_clientData = data;
     m_clientDataType = ClientData_Void;


@@ -1265,7 +1290,7 @@ void wxWindowBase::DoSetClientData( void *data )
 void *wxWindowBase::DoGetClientData() const
 {
     wxASSERT_MSG( m_clientDataType == ClientData_Void,
 void *wxWindowBase::DoGetClientData() const
 {
     wxASSERT_MSG( m_clientDataType == ClientData_Void,

-                  T("this window doesn't have void client data") );
+                  wxT("this window doesn't have void client data") );

 
     return m_clientData;
 }
 
     return m_clientData;
 }