cosmetic fixes to font encoding names

[wxWidgets.git] / src / mac / dialog.cpp

diff --git a/src/mac/dialog.cpp b/src/mac/dialog.cpp
index 2acc18174e7886995ac5cf6114f40fc9e7dc6f4c..760c07680a91543be3bb019f8eba670f2e08b247 100644 (file)
--- a/src/mac/dialog.cpp
+++ b/src/mac/dialog.cpp
@@ -44,6 +44,7 @@ END_EVENT_TABLE()
 
 wxDialog::wxDialog()
 {
 
 wxDialog::wxDialog()
 {

+       m_isShown = FALSE;

     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
 }
 
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
 }
 


@@ -54,10 +55,8 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
            long style,
            const wxString& name)
 {

-  m_windowStyle = style;

 
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
 
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));

-  SetName(name);

   
   if (!parent)
     wxTopLevelWindows.Append(this);
   
   if (!parent)
     wxTopLevelWindows.Append(this);


@@ -69,59 +68,26 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
   else
        m_windowId = id;
 
   else
        m_windowId = id;
 

-       Rect theBoundsRect;
-
-  m_x = (int)pos.x;
-  m_y = (int)pos.y;
-  if ( m_y < 50 )
-       m_y = 50 ;
-  if ( m_x < 20 )
-       m_x = 20 ;
-       
-  m_width = size.x;
-       if (m_width == -1) 
-               m_width = 20;
-  m_height = size.y;
-       if (m_height == -1) 
-               m_height = 20;
-
-       ::SetRect(&theBoundsRect, m_x, m_y, m_x + m_width, m_y + m_height);
-       m_macWindowData = new MacWindowData() ;
-
-       WindowClass wclass = kMovableModalWindowClass ;
-       WindowAttributes attr = kWindowNoAttributes ;
-       
-       if ( ( m_windowStyle & wxMINIMIZE_BOX ) || ( m_windowStyle & wxMAXIMIZE_BOX ) )
-       {
-               attr |= kWindowFullZoomAttribute ;
-               attr |= kWindowResizableAttribute ;
-       }
+       MacCreateRealWindow( title , pos , size , MacRemoveBordersFromStyle(style)  , name ) ;

 
 

-       UMACreateNewWindow( wclass , attr , &theBoundsRect , &m_macWindowData->m_macWindow ) ;
-       wxAssociateWinWithMacWindow( m_macWindowData->m_macWindow , this ) ;
-       wxString label ;
-       if( wxApp::s_macDefaultEncodingIsPC )
-               label = wxMacMakeMacStringFromPC( title ) ;
-       else
-               label = title ;
-       UMASetWTitleC( m_macWindowData->m_macWindow , label ) ;

        m_macWindowData->m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ;
        m_macWindowData->m_macWindowBackgroundTheme = kThemeBrushDialogBackgroundActive ;

-       UMACreateRootControl( m_macWindowData->m_macWindow , &m_macWindowData->m_macRootControl ) ;
-       m_macWindowData->m_macFocus = NULL ;

   return TRUE;
 }
 
 void wxDialog::SetModal(bool flag)
 {
   return TRUE;
 }
 
 void wxDialog::SetModal(bool flag)
 {

-       if ( flag )
-               m_windowStyle |= wxDIALOG_MODAL ;
-       else
-               if ( m_windowStyle & wxDIALOG_MODAL )
-                       m_windowStyle -= wxDIALOG_MODAL ;
-  
-  wxModelessWindows.DeleteObject(this);
-  if (!flag)
-    wxModelessWindows.Append(this);
+  if ( flag )
+    {
+        m_windowStyle |= wxDIALOG_MODAL;
+
+        wxModelessWindows.DeleteObject(this);
+    }
+    else
+    {
+        m_windowStyle &= ~wxDIALOG_MODAL;
+
+        wxModelessWindows.Append(this);
+    }

 }
 
 wxDialog::~wxDialog()
 }
 
 wxDialog::~wxDialog()


@@ -129,10 +95,10 @@ wxDialog::~wxDialog()
        m_isBeingDeleted = TRUE ;
     wxTopLevelWindows.DeleteObject(this);
 
        m_isBeingDeleted = TRUE ;
     wxTopLevelWindows.DeleteObject(this);
 

-  m_modalShowing = FALSE;
+       Show(FALSE);

 
 

-  if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )
-    wxModelessWindows.DeleteObject(this);
+    if ( !IsModal() )
+       wxModelessWindows.DeleteObject(this);

 
     // If this is the last top-level window, exit.
     if (wxTheApp && (wxTopLevelWindows.Number() == 0))
 
     // If this is the last top-level window, exit.
     if (wxTheApp && (wxTopLevelWindows.Number() == 0))


@@ -165,94 +131,109 @@ void wxDialog::OnCharHook(wxKeyEvent& event)
 
 void wxDialog::Iconize(bool WXUNUSED(iconize))
 {
 
 void wxDialog::Iconize(bool WXUNUSED(iconize))
 {

-    // TODO
+       // mac dialogs cannot be iconized

 }
 
 bool wxDialog::IsIconized() const
 {
 }
 
 bool wxDialog::IsIconized() const
 {

-    // TODO
+       // mac dialogs cannot be iconized

     return FALSE;
 }
 
     return FALSE;
 }
 

+void wxDialog::DoSetClientSize(int width, int height)
+{
+       wxWindow::DoSetClientSize( width , height ) ;
+}
+
+void wxDialog::DoGetPosition(int *x, int *y) const
+{
+       wxWindow::DoGetPosition( x , y ) ;
+}
+
+bool wxDialog::IsModal() const
+{
+    return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
+}
+
+
+bool wxDialog::IsModalShowing() const
+{
+    return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
+}
+
+

 extern bool s_macIsInModalLoop ;
 
 bool wxDialog::Show(bool show)
 {
 extern bool s_macIsInModalLoop ;
 
 bool wxDialog::Show(bool show)
 {

-  m_isShown = show;
+    if ( !wxDialogBase::Show(show) )
+    {
+        // nothing to do
+        return FALSE;
+    }
+
+    if ( show )
+    {
+        // usually will result in TransferDataToWindow() being called
+        InitDialog();
+    }

 
 

-  if (show)
-    InitDialog();
+    if ( IsModal() )
+    {
+        if ( show )
+        {
+            DoShowModal();
+        }
+        else // end of modal dialog
+        {
+            // this will cause IsModalShowing() return FALSE and our local
+            // message loop will terminate
+            wxModalDialogs.DeleteObject(this);
+        }
+    }

 
 

-  bool modal =  ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL) ;
+    return TRUE;
+}

 
 

-#if WXGARBAGE_COLLECTION_ON /* MATTHEW: GC */
-  if (!modal) 
-  {
-    if (show) 
+void wxDialog::DoShowModal()
+{
+    wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
+
+    wxModalDialogs.Append(this);
+
+       wxWindow *parent = GetParent();
+
+    // remember where the focus was
+    wxWindow *winFocus = FindFocus();
+    if ( !winFocus )

     {
     {

-      if (!wxModelessWindows.Find(this))
-        wxModelessWindows.Append(this);
-    } 
-    else
-      wxModelessWindows.DeleteObject(this);
-  }
-  if (show) 
-  {
-    if (!wxTopLevelWindows.Find(this))
-       wxTopLevelWindows.Append(this);
-  } 
-  else
-       wxTopLevelWindows.DeleteObject(this);
-#endif
+        winFocus = parent;
+    }
+    if ( !winFocus )
+    {
+        winFocus = wxTheApp->GetTopWindow();
+    }
+       // TODO : test whether parent gets disabled

 
 

-       if ( modal )
-       {
-               s_macIsInModalLoop = true ;
-               if (show)
-               {
-               if (m_modalShowing)
-               {
-//                     BringWindowToTop((HWND) GetHWND());
-                       return TRUE;
-               }
-
-               m_modalShowing = TRUE;
-               // if we don't do it, some window might be deleted while we have pointers
-               // to them in our disabledWindows list and the program will crash when it
-               // will try to reenable them after the modal dialog end
-               wxTheApp->DeletePendingObjects();
-
-               UMAShowWindow( m_macWindowData->m_macWindow ) ;
-               UMASelectWindow( m_macWindowData->m_macWindow ) ;
-
-       if (!wxModalDialogs.Member(this))
-               wxModalDialogs.Append(this);
-
-       while (wxModalDialogs.Member(this) )
-       {
-               wxTheApp->MacDoOneEvent() ;
-       }
-         }
-         else
-         {
-       wxModalDialogs.DeleteObject(this);
-       UMAHideWindow( m_macWindowData->m_macWindow ) ;
-         }
-         s_macIsInModalLoop = false ;
-       }
-       else // !modal
+       s_macIsInModalLoop = true ;
+
+       while ( IsModalShowing() )

        {
        {

-         if (show)
-         {
-       UMAShowWindow( m_macWindowData->m_macWindow ) ;
-       UMASelectWindow( m_macWindowData->m_macWindow ) ;
-         }
-         else
-         {
-       UMAHideWindow( m_macWindowData->m_macWindow ) ;
-         }
+               while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() )
+               {
+               }
+               wxTheApp->MacDoOneEvent() ;

        }
        }

-       return TRUE ;
+       
+       s_macIsInModalLoop = false ;
+
+    // TODO probably reenable the parent window if any
+
+    // and restore focus
+    if ( winFocus )
+    {
+        winFocus->SetFocus();
+    }

 }
 
 
 }
 
 


@@ -260,48 +241,37 @@ bool wxDialog::Show(bool show)
 int wxDialog::ShowModal()
 {
   m_windowStyle |= wxDIALOG_MODAL;
 int wxDialog::ShowModal()
 {
   m_windowStyle |= wxDIALOG_MODAL;

-       Show(TRUE);
-       return GetReturnCode();
+  Show(TRUE);
+  return GetReturnCode();

 }
 
 }
 

+// NB: this function (surprizingly) may be called for both modal and modeless
+//     dialogs and should work for both of them

 void wxDialog::EndModal(int retCode)
 {
 void wxDialog::EndModal(int retCode)
 {

-       SetReturnCode(retCode);
-    // TODO modal un-showing
-       Show(FALSE);
+  SetReturnCode(retCode);
+  Show(FALSE);

 }
 
 // Standard buttons
 void wxDialog::OnOK(wxCommandEvent& event)
 {
 }
 
 // Standard buttons
 void wxDialog::OnOK(wxCommandEvent& event)
 {

-       if ( Validate() && TransferDataFromWindow() )
-       {
-        if ( IsModal() )
-            EndModal(wxID_OK);
-        else
-        {
-                   SetReturnCode(wxID_OK);
-                   this->Show(FALSE);
-        }
-       }
+  if ( Validate() && TransferDataFromWindow() )
+  {
+      EndModal(wxID_OK);
+  }

 }
 
 void wxDialog::OnApply(wxCommandEvent& event)
 {
 }
 
 void wxDialog::OnApply(wxCommandEvent& event)
 {

-       if (Validate())
-               TransferDataFromWindow();
-       // TODO probably need to disable the Apply button until things change again
+  if (Validate())
+    TransferDataFromWindow();
+  // TODO probably need to disable the Apply button until things change again

 }
 
 void wxDialog::OnCancel(wxCommandEvent& event)
 {
 }
 
 void wxDialog::OnCancel(wxCommandEvent& event)
 {

-    if ( IsModal() )

         EndModal(wxID_CANCEL);
         EndModal(wxID_CANCEL);

-    else
-    {
-        SetReturnCode(wxID_CANCEL);
-               this->Show(FALSE);
-    }

 }
 
 void wxDialog::OnCloseWindow(wxCloseEvent& event)
 }
 
 void wxDialog::OnCloseWindow(wxCloseEvent& event)


@@ -321,12 +291,12 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
     // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog.
 
     static wxList closing;
     // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog.
 
     static wxList closing;

-    
+

     if ( closing.Member(this) )
         return;
     if ( closing.Member(this) )
         return;

-    
+

     closing.Append(this);
     closing.Append(this);

-    
+

     wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     cancelEvent.SetEventObject( this );
     GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog
     wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     cancelEvent.SetEventObject( this );
     GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog


@@ -337,29 +307,16 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
 // Destroy the window (delayed, if a managed window)
 bool wxDialog::Destroy()
 {
 // Destroy the window (delayed, if a managed window)
 bool wxDialog::Destroy()
 {

-  if (!wxPendingDelete.Member(this))
+    wxCHECK_MSG( !wxPendingDelete.Member(this), FALSE,
+                 _T("wxDialog destroyed twice") );
+

     wxPendingDelete.Append(this);
   return TRUE;
 }
 
     wxPendingDelete.Append(this);
   return TRUE;
 }
 

-void wxDialog::OnSize(wxSizeEvent& WXUNUSED(event))
-{
-  // if we're using constraints - do use them
-  #if wxUSE_CONSTRAINTS
-    if ( GetAutoLayout() ) {
-      Layout();
-    }
-  #endif
-}
-

 void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
   Refresh();
 }
 
 void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
   Refresh();
 }
 

-void wxDialog::Fit()
-{
-  wxWindow::Fit();
-}
-