Added wxFontEnumerator class for wxMSW, and fixed text validator for French

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

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 87709ad66a4b3dcc167a3a3f55fcca2783800481..d754cab3457bbb335d42d81ed2b06b3d9a344d08 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -43,6 +43,7 @@
 
 #if wxUSE_CONSTRAINTS
     #include "wx/layout.h"
 
 #if wxUSE_CONSTRAINTS
     #include "wx/layout.h"

+    #include "wx/sizer.h"

 #endif // wxUSE_CONSTRAINTS
 
 #if wxUSE_DRAG_AND_DROP
 #endif // wxUSE_CONSTRAINTS
 
 #if wxUSE_DRAG_AND_DROP


@@ -100,9 +101,9 @@ void wxWindowBase::InitBase()
     m_isShown = FALSE;
     m_isEnabled = TRUE;
 
     m_isShown = FALSE;
     m_isEnabled = TRUE;
 

-    // no client data
-    m_clientObject = (wxClientData *)NULL;
+    // no client data (yet)

     m_clientData = NULL;
     m_clientData = NULL;

+    m_clientDataType = ClientData_None;

 
     // the default event handler is just this window
     m_eventHandler = this;
 
     // the default event handler is just this window
     m_eventHandler = this;


@@ -131,7 +132,6 @@ void wxWindowBase::InitBase()
     m_constraints = (wxLayoutConstraints *) NULL;
     m_constraintsInvolvedIn = (wxWindowList *) NULL;
     m_windowSizer = (wxSizer *) NULL;
     m_constraints = (wxLayoutConstraints *) NULL;
     m_constraintsInvolvedIn = (wxWindowList *) NULL;
     m_windowSizer = (wxSizer *) NULL;

-    m_sizerParent = (wxWindowBase *) NULL;

     m_autoLayout = FALSE;
 #endif // wxUSE_CONSTRAINTS
 
     m_autoLayout = FALSE;
 #endif // wxUSE_CONSTRAINTS
 


@@ -154,6 +154,7 @@ 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,

+                              const wxValidator& validator,

                               const wxString& name)
 {
     // m_isWindow is set to TRUE in wxWindowBase::Init() as well as many other
                               const wxString& name)
 {
     // m_isWindow is set to TRUE in wxWindowBase::Init() as well as many other


@@ -167,6 +168,7 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
     SetName(name);
     SetWindowStyleFlag(style);
     SetParent(parent);
     SetName(name);
     SetWindowStyleFlag(style);
     SetParent(parent);

+    SetValidator(validator);

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -191,6 +193,16 @@ wxWindowBase::~wxWindowBase()
 
     wxASSERT_MSG( GetChildren().GetCount() == 0, _T("children not destroyed") );
 
 
     wxASSERT_MSG( GetChildren().GetCount() == 0, _T("children not destroyed") );
 

+    // make sure that there are no dangling pointers left pointing to us
+    wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
+    if ( panel )
+    {
+        if ( panel->GetLastFocus() == this )
+        {
+            panel->SetLastFocus((wxWindow *)NULL);
+        }
+    }
+

 #if wxUSE_CARET
     if ( m_caret )
         delete m_caret;
 #if wxUSE_CARET
     if ( m_caret )
         delete m_caret;


@@ -201,7 +213,8 @@ wxWindowBase::~wxWindowBase()
         delete m_windowValidator;
 #endif // wxUSE_VALIDATORS
 
         delete m_windowValidator;
 #endif // wxUSE_VALIDATORS
 

-    if ( m_clientObject )
+    // we only delete object data, not untyped
+    if ( m_clientDataType == ClientData_Object )

         delete m_clientObject;
 
 #if wxUSE_CONSTRAINTS
         delete m_clientObject;
 
 #if wxUSE_CONSTRAINTS


@@ -221,9 +234,6 @@ wxWindowBase::~wxWindowBase()
     if ( m_windowSizer )
         delete m_windowSizer;
 
     if ( m_windowSizer )
         delete m_windowSizer;
 

-    // If this is a child of a sizer, remove self from parent
-    if ( m_sizerParent )
-        m_sizerParent->RemoveChild(this);

 #endif // wxUSE_CONSTRAINTS
 
 #if wxUSE_DRAG_AND_DROP
 #endif // wxUSE_CONSTRAINTS
 
 #if wxUSE_DRAG_AND_DROP


@@ -291,57 +301,50 @@ void wxWindowBase::Centre(int direction)
     int widthParent, heightParent;
 
     wxWindow *parent = GetParent();
     int widthParent, heightParent;
 
     wxWindow *parent = GetParent();

-    if ( parent )
+    if ( !parent )

     {
     {

-        parent->GetClientSize(&widthParent, &heightParent);
+        // no other choice
+        direction |= wxCENTRE_ON_SCREEN;

     }
     }

-    else
+
+    if ( direction & wxCENTRE_ON_SCREEN )

     {
         // centre with respect to the whole screen
         wxDisplaySize(&widthParent, &heightParent);
     }
     {
         // centre with respect to the whole screen
         wxDisplaySize(&widthParent, &heightParent);
     }

+    else
+    {
+        // centre inside the parents rectangle
+        parent->GetClientSize(&widthParent, &heightParent);
+    }

 
     int width, height;
     GetSize(&width, &height);
 
 
     int width, height;
     GetSize(&width, &height);
 

-    int new_x = -1,
-        new_y = -1;
+    int xNew = -1,
+        yNew = -1;

 
     if ( direction & wxHORIZONTAL )
 
     if ( direction & wxHORIZONTAL )

-        new_x = (widthParent - width)/2;
+        xNew = (widthParent - width)/2;

 
     if ( direction & wxVERTICAL )
 
     if ( direction & wxVERTICAL )

-        new_y = (heightParent - height)/2;
-
-    Move(new_x, new_y);
-}
-
-// Center TopLevel windows over thier parent instead of the whole screen
-void wxWindowBase::CentreOnParent(int direction)
-{
-    wxPoint     ppos;
-    wxSize      psze;
-    wxSize      wsze;
-    wxWindow*   parent = GetParent();
-    int         x, y;
-
-    if (!parent || !IsTopLevel()) {
-        Centre(direction);
-        return;
-    }
+        yNew = (heightParent - height)/2;

 
 

-    psze = parent->GetSize();
-    ppos = parent->ClientToScreen(wxPoint(0,0));
-    wsze = GetSize();
+    // controls are always centered on their parent because it doesn't make
+    // sense to centre them on the screen
+    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") );

 
 

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

 
 

-    if (direction == wxBOTH || direction == wxHORIZONTAL)
-        x = ppos.x + (psze.x  - wsze.x)/2;
-    if (direction == wxBOTH || direction == wxVERTICAL)
-        y = ppos.y + (psze.y - wsze.y)/2;
+        xNew += posParent.x;
+        yNew += posParent.y;
+    }

 
 

-    Move(x, y);
+    Move(xNew, yNew);

 }
 
 // fits the window around the children
 }
 
 // fits the window around the children


@@ -536,7 +539,7 @@ bool wxWindowBase::SetCursor(const wxCursor& cursor)
     // don't try to set invalid cursor, always fall back to the default
     const wxCursor& cursorOk = cursor.Ok() ? cursor : *wxSTANDARD_CURSOR;
 
     // don't try to set invalid cursor, always fall back to the default
     const wxCursor& cursorOk = cursor.Ok() ? cursor : *wxSTANDARD_CURSOR;
 

-    if ( cursorOk == m_cursor )
+    if ( (wxCursor&)cursorOk == m_cursor )

     {
         // no change
         return FALSE;
     {
         // no change
         return FALSE;


@@ -552,7 +555,7 @@ bool wxWindowBase::SetFont(const wxFont& font)
     // don't try to set invalid font, always fall back to the default
     const wxFont& fontOk = font.Ok() ? font : *wxSWISS_FONT;
 
     // don't try to set invalid font, always fall back to the default
     const wxFont& fontOk = font.Ok() ? font : *wxSWISS_FONT;
 

-    if ( fontOk == m_font )
+    if ( (wxFont&)fontOk == m_font )

     {
         // no change
         return FALSE;
     {
         // no change
         return FALSE;


@@ -883,39 +886,35 @@ void wxWindowBase::DeleteRelatedConstraints()
 
 void wxWindowBase::SetSizer(wxSizer *sizer)
 {
 
 void wxWindowBase::SetSizer(wxSizer *sizer)
 {

+    if (m_windowSizer) delete m_windowSizer;
+

     m_windowSizer = sizer;
     m_windowSizer = sizer;

-    if ( sizer )
-        sizer->SetSizerParent(this);

 }
 
 bool wxWindowBase::Layout()
 {
 }
 
 bool wxWindowBase::Layout()
 {

-    if ( GetConstraints() )
-    {
-        int w, h;
-        GetClientSize(&w, &h);
-        GetConstraints()->width.SetValue(w);
-        GetConstraints()->height.SetValue(h);
-    }
-
-    // If top level (one sizer), evaluate the sizer's constraints.
+    int w, h;
+    GetClientSize(&w, &h);
+    
+    // If there is a sizer, use it instead of the constraints

     if ( GetSizer() )
     {
     if ( GetSizer() )
     {

-        int noChanges;
-        GetSizer()->ResetConstraints();   // Mark all constraints as unevaluated
-        GetSizer()->LayoutPhase1(&noChanges);
-        GetSizer()->LayoutPhase2(&noChanges);
-        GetSizer()->SetConstraintSizes(); // Recursively set the real window sizes
+        GetSizer()->SetDimension( 0, 0, w, h );

         return TRUE;
     }
         return TRUE;
     }

-    else
+    
+    if ( GetConstraints() )

     {
     {

-        // Otherwise, evaluate child constraints
-        ResetConstraints();   // Mark all constraints as unevaluated
-        DoPhase(1);           // Just one phase need if no sizers involved
-        DoPhase(2);
-        SetConstraintSizes(); // Recursively set the real window sizes
+        GetConstraints()->width.SetValue(w);
+        GetConstraints()->height.SetValue(h);

     }
     }

+       
+    // Evaluate child constraints
+    ResetConstraints();   // Mark all constraints as unevaluated
+    DoPhase(1);           // Just one phase need if no sizers involved
+    DoPhase(2);
+    SetConstraintSizes(); // Recursively set the real window sizes
+    

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -1023,17 +1022,15 @@ void wxWindowBase::SetConstraintSizes(bool recurse)
         int w = constr->width.GetValue();
         int h = constr->height.GetValue();
 
         int w = constr->width.GetValue();
         int h = constr->height.GetValue();
 

-        // If we don't want to resize this window, just move it...

         if ( (constr->width.GetRelationship() != wxAsIs ) ||
         if ( (constr->width.GetRelationship() != wxAsIs ) ||

-                (constr->height.GetRelationship() != wxAsIs))
+             (constr->height.GetRelationship() != wxAsIs) )

         {
         {

-            // Calls Layout() recursively. AAAGH. How can we stop that.
-            // Simply take Layout() out of non-top level OnSizes.
-            SizerSetSize(x, y, w, h);
+            SetSize(x, y, w, h);

         }
         else
         {
         }
         else
         {

-            SizerMove(x, y);
+            // If we don't want to resize this window, just move it...
+            Move(x, y);

         }
     }
     else if ( constr )
         }
     }
     else if ( constr )


@@ -1068,36 +1065,6 @@ void wxWindowBase::SetConstraintSizes(bool recurse)
     }
 }
 
     }
 }
 

-// This assumes that all sizers are 'on' the same window, i.e. the parent of
-// this window.
-void wxWindowBase::TransformSizerToActual(int *x, int *y) const
-{
-    if ( !m_sizerParent || m_sizerParent->IsTopLevel() )
-        return;
-
-    int xp, yp;
-    m_sizerParent->GetPosition(&xp, &yp);
-    m_sizerParent->TransformSizerToActual(&xp, &yp);
-    *x += xp;
-    *y += yp;
-}
-
-void wxWindowBase::SizerSetSize(int x, int y, int w, int h)
-{
-    int xx = x;
-    int yy = y;
-    TransformSizerToActual(&xx, &yy);
-    SetSize(xx, yy, w, h);
-}
-
-void wxWindowBase::SizerMove(int x, int y)
-{
-    int xx = x;
-    int yy = y;
-    TransformSizerToActual(&xx, &yy);
-    Move(xx, yy);
-}
-

 // Only set the size/position of the constraint (if any)
 void wxWindowBase::SetSizeConstraint(int x, int y, int w, int h)
 {
 // Only set the size/position of the constraint (if any)
 void wxWindowBase::SetSizeConstraint(int x, int y, int w, int h)
 {


@@ -1240,9 +1207,11 @@ wxPoint wxWindowBase::ConvertPixelsToDialog(const wxPoint& pt)
 {
     int charWidth = GetCharWidth();
     int charHeight = GetCharHeight();
 {
     int charWidth = GetCharWidth();
     int charHeight = GetCharHeight();

-    wxPoint pt2;
-    pt2.x = (int) ((pt.x * 4) / charWidth) ;
-    pt2.y = (int) ((pt.y * 8) / charHeight) ;
+    wxPoint pt2(-1, -1);
+    if (pt.x != -1)
+        pt2.x = (int) ((pt.x * 4) / charWidth) ;
+    if (pt.y != -1)
+        pt2.y = (int) ((pt.y * 8) / charHeight) ;

 
     return pt2;
 }
 
     return pt2;
 }


@@ -1251,13 +1220,56 @@ wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt)
 {
     int charWidth = GetCharWidth();
     int charHeight = GetCharHeight();
 {
     int charWidth = GetCharWidth();
     int charHeight = GetCharHeight();

-    wxPoint pt2;
-    pt2.x = (int) ((pt.x * charWidth) / 4) ;
-    pt2.y = (int) ((pt.y * charHeight) / 8) ;
+    wxPoint pt2(-1, -1);
+    if (pt.x != -1)
+        pt2.x = (int) ((pt.x * charWidth) / 4) ;
+    if (pt.y != -1)
+        pt2.y = (int) ((pt.y * charHeight) / 8) ;

 
     return pt2;
 }
 
 
     return pt2;
 }
 

+// ----------------------------------------------------------------------------
+// client data
+// ----------------------------------------------------------------------------
+
+void wxWindowBase::DoSetClientObject( wxClientData *data )
+{
+    wxASSERT_MSG( m_clientDataType != ClientData_Void,
+                  _T("can't have both object and void client data") );
+
+    if ( m_clientObject )
+        delete m_clientObject;
+
+    m_clientObject = data;
+    m_clientDataType = ClientData_Object;
+}
+
+wxClientData *wxWindowBase::DoGetClientObject() const
+{
+    wxASSERT_MSG( m_clientDataType == ClientData_Object,
+                  _T("this window doesn't have object client data") );
+
+    return m_clientObject;
+}
+
+void wxWindowBase::DoSetClientData( void *data )
+{
+    wxASSERT_MSG( m_clientDataType != ClientData_Object,
+                  _T("can't have both object and void client data") );
+
+    m_clientData = data;
+    m_clientDataType = ClientData_Void;
+}
+
+void *wxWindowBase::DoGetClientData() const
+{
+    wxASSERT_MSG( m_clientDataType == ClientData_Void,
+                  _T("this window doesn't have void client data") );
+
+    return m_clientData;
+}
+

 // ----------------------------------------------------------------------------
 // event handlers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // event handlers
 // ----------------------------------------------------------------------------