Some Unicode fixes (mostly for Borland's pickiness regarding _T(), which

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

diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index b8c54679b7dbe8fb51c42ffc644ab6fefaaa1488..7edb2940c8712fd6b239715896d9ca75d1944ba4 100644 (file)
--- a/src/gtk1/dialog.cpp
+++ b/src/gtk1/dialog.cpp
@@ -56,7 +56,12 @@ static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation
     printf( ".\n" );
 */
 
     printf( ".\n" );
 */
 

-    win->GtkOnSize( alloc->x, alloc->y, alloc->width, alloc->height );
+   if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
+   {
+       win->m_sizeSet = FALSE;
+       win->m_width = alloc->width;
+       win->m_height = alloc->height;
+   }

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


@@ -91,9 +96,9 @@ END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxPanel)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxPanel)
 

-wxDialog::wxDialog()
+void wxDialog::Init()

 {
 {

-    m_title = "";
+    m_sizeSet = FALSE;

     m_modalShowing = FALSE;
 }
 
     m_modalShowing = FALSE;
 }
 


@@ -102,7 +107,8 @@ wxDialog::wxDialog( wxWindow *parent,
                     const wxPoint &pos, const wxSize &size,
                     long style, const wxString &name )
 {
                     const wxPoint &pos, const wxSize &size,
                     long style, const wxString &name )
 {

-    m_modalShowing = FALSE;
+    Init();
+

     Create( parent, id, title, pos, size, style, name );
 }
 
     Create( parent, id, title, pos, size, style, name );
 }
 


@@ -133,10 +139,40 @@ bool wxDialog::Create( wxWindow *parent,
 
     SetTitle( title );
 
 
     SetTitle( title );
 

-    if ((m_x != -1) || (m_y != -1))
-        gtk_widget_set_uposition( m_widget, m_x, m_y );
+    if (m_parent) m_parent->AddChild( this );

 
 

-    gtk_widget_set_usize( m_widget, m_width, m_height );
+    PostCreation();
+
+    gtk_widget_realize( m_widget );
+
+    /* all this is for Motif Window Manager "hints" and is supposed to be
+       recognized by other WM as well. not tested. */
+    long decor = (long) GDK_DECOR_ALL;
+    long func = (long) GDK_FUNC_ALL;
+    
+    if ((m_windowStyle & wxCAPTION) == 0)
+       decor |= GDK_DECOR_TITLE;
+/*  if ((m_windowStyle & wxMINIMIZE) == 0)
+       func |= GDK_FUNC_MINIMIZE;
+    if ((m_windowStyle & wxMAXIMIZE) == 0)
+       func |= GDK_FUNC_MAXIMIZE; */
+    if ((m_windowStyle & wxSYSTEM_MENU) == 0)
+       decor |= GDK_DECOR_MENU;
+    if ((m_windowStyle & wxMINIMIZE_BOX) == 0)
+       decor |= GDK_DECOR_MINIMIZE;
+    if ((m_windowStyle & wxMAXIMIZE_BOX) == 0)
+       decor |= GDK_DECOR_MAXIMIZE;
+    if ((m_windowStyle & wxRESIZE_BORDER) == 0)
+       func |= GDK_FUNC_RESIZE;
+       
+    gdk_window_set_decorations(m_widget->window, (GdkWMDecoration)decor);
+    gdk_window_set_functions(m_widget->window, (GdkWMFunction)func);
+    
+    /* GTK's shrinking/growing policy */
+    if ((m_windowStyle & wxRESIZE_BORDER) == 0)
+        gtk_window_set_policy(GTK_WINDOW(m_widget), 0, 0, 1);
+    else
+        gtk_window_set_policy(GTK_WINDOW(m_widget), 1, 1, 1);

 
     gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
         GTK_SIGNAL_FUNC(gtk_dialog_size_callback), (gpointer)this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
         GTK_SIGNAL_FUNC(gtk_dialog_size_callback), (gpointer)this );


@@ -144,10 +180,6 @@ bool wxDialog::Create( wxWindow *parent,
     gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event",
         GTK_SIGNAL_FUNC(gtk_dialog_configure_callback), (gpointer)this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event",
         GTK_SIGNAL_FUNC(gtk_dialog_configure_callback), (gpointer)this );
 

-    if (m_parent) m_parent->AddChild( this );
-
-    PostCreation();
-

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -169,8 +201,8 @@ wxDialog::~wxDialog()
 void wxDialog::SetTitle( const wxString& title )
 {
     m_title = title;
 void wxDialog::SetTitle( const wxString& title )
 {
     m_title = title;

-    if (m_title.IsNull()) m_title = "";
-    gtk_window_set_title( GTK_WINDOW(m_widget), m_title );
+    if (m_title.IsNull()) m_title = _T("");
+    gtk_window_set_title( GTK_WINDOW(m_widget), m_title.mbc_str() );

 }
 
 wxString wxDialog::GetTitle() const
 }
 
 wxString wxDialog::GetTitle() const


@@ -233,17 +265,17 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
     // sure to destroy the dialog.
     // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog.
 
     // sure to destroy the dialog.
     // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog.
 

-    static wxList closing;
+    static wxList s_closing;

 
 

-    if (closing.Member(this))
+    if (s_closing.Member(this))

         return;   // no loops
 
         return;   // no loops
 

-    closing.Append(this);
+    s_closing.Append(this);

 
     wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     cancelEvent.SetEventObject( this );
     GetEventHandler()->ProcessEvent(cancelEvent);
 
     wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     cancelEvent.SetEventObject( this );
     GetEventHandler()->ProcessEvent(cancelEvent);

-    closing.DeleteObject(this);
+    s_closing.DeleteObject(this);

 }
 
 bool wxDialog::Destroy()
 }
 
 bool wxDialog::Destroy()


@@ -253,36 +285,9 @@ bool wxDialog::Destroy()
     return TRUE;
 }
 
     return TRUE;
 }
 

-void wxDialog::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
-{
-    // due to a bug in gtk, x,y are always 0
-    // m_x = x;
-    // m_y = y;
-
-    if ((m_height == height) && (m_width == width) &&
-        (m_sizeSet)) return;
-    if (!m_wxwindow) return;
-
-    m_width = width;
-    m_height = height;
-
-    if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
-    if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
-    if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
-    if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
-
-    gtk_widget_set_usize( m_widget, m_width, m_height );
-
-    m_sizeSet = TRUE;
-
-    wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent( event );
-}
-

 void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
 void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) )
 {

-    wxASSERT_MSG( (m_widget != NULL), "invalid dialog" );
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid dialog") );

 
     if (GetAutoLayout())
     {
 
     if (GetAutoLayout())
     {


@@ -290,37 +295,35 @@ void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) )
     }
     else
     {
     }
     else
     {

-        // no child: go out !
+        /* no child: go out ! */

         if (!GetChildren().First()) return;
 
         if (!GetChildren().First()) return;
 

-        // do we have exactly one child?
+        /* do we have exactly one child? */

         wxWindow *child = (wxWindow *) NULL;
         for(wxNode *node = GetChildren().First(); node; node = node->Next())
         {
             wxWindow *win = (wxWindow *)node->Data();
             if (!wxIS_KIND_OF(win,wxFrame) && !wxIS_KIND_OF(win,wxDialog))
             {
         wxWindow *child = (wxWindow *) NULL;
         for(wxNode *node = GetChildren().First(); node; node = node->Next())
         {
             wxWindow *win = (wxWindow *)node->Data();
             if (!wxIS_KIND_OF(win,wxFrame) && !wxIS_KIND_OF(win,wxDialog))
             {

-                // it's the second one: do nothing
+                /* it's the second one: do nothing */

                 if (child) return;
                 child = win;
             }
         }
 
                 if (child) return;
                 child = win;
             }
         }
 

-        // yes: set it's size to fill all the frame
+        /* yes: set it's size to fill all the frame */

         int client_x, client_y;
         GetClientSize( &client_x, &client_y );
         child->SetSize( 1, 1, client_x-2, client_y);
     }
 }
 
         int client_x, client_y;
         GetClientSize( &client_x, &client_y );
         child->SetSize( 1, 1, client_x-2, client_y);
     }
 }
 

-void wxDialog::SetSize( int x, int y, int width, int height, int sizeFlags )
+void wxDialog::DoSetSize( int x, int y, int width, int height, int sizeFlags )

 {
 {

-    wxASSERT_MSG( (m_widget != NULL), "invalid window" );
-
-    // Don't do anything for children of wxMDIChildFrame
-    if (!m_wxwindow) return;
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid dialog") );
+    wxASSERT_MSG( (m_wxwindow != NULL), _T("invalid dialog") );

 
 

-    if (m_resizing) return; // I don't like recursions
+    if (m_resizing) return; /* I don't like recursions */

     m_resizing = TRUE;
 
     int old_x = m_x;
     m_resizing = TRUE;
 
     int old_x = m_x;


@@ -361,46 +364,81 @@ void wxDialog::SetSize( int x, int y, int width, int height, int sizeFlags )
     if ((m_x != -1) || (m_y != -1))
     {
         if ((m_x != old_x) || (m_y != old_y))
     if ((m_x != -1) || (m_y != -1))
     {
         if ((m_x != old_x) || (m_y != old_y))

+       {
+            /* m_sizeSet = FALSE; */

             gtk_widget_set_uposition( m_widget, m_x, m_y );
             gtk_widget_set_uposition( m_widget, m_x, m_y );

+       }

     }
 
     if ((m_width != old_width) || (m_height != old_height))
     {
     }
 
     if ((m_width != old_width) || (m_height != old_height))
     {

-        gtk_widget_set_usize( m_widget, m_width, m_height );
+        m_sizeSet = FALSE;

     }
 
     }
 

+    m_resizing = FALSE;
+}
+
+void wxDialog::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
+{
+    // due to a bug in gtk, x,y are always 0
+    // m_x = x;
+    // m_y = y;
+
+    if ((m_height == height) && (m_width == width) && (m_sizeSet)) return;
+    if (!m_wxwindow) return;
+
+    m_width = width;
+    m_height = height;
+
+    if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
+    if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
+    if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
+    if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
+
+    /* we actually set the size of a frame here and no-where else */
+    gtk_widget_set_usize( m_widget, m_width, m_height );
+

     m_sizeSet = TRUE;
 
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( event );
     m_sizeSet = TRUE;
 
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( event );

-
-    m_resizing = FALSE;
-}
-
-void wxDialog::SetSize( int width, int height )
-{
-    SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING );

 }
 
 void wxDialog::Centre( int direction )
 {
 }
 
 void wxDialog::Centre( int direction )
 {

-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid dialog") );

 
     int x = 0;
     int y = 0;
 
 
     int x = 0;
     int y = 0;
 

-    if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2;
-    if (direction & wxVERTICAL == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2;
+    if ((direction & wxHORIZONTAL) == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2;
+    if ((direction & wxVERTICAL) == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2;

 
     Move( x, y );
 }
 
 
     Move( x, y );
 }
 

+void wxDialog::OnInternalIdle()
+{
+    if (!m_sizeSet)
+        GtkOnSize( m_x, m_y, m_width, m_height );
+}
+

 bool wxDialog::Show( bool show )
 {
     if (!show && IsModal())
     {
 bool wxDialog::Show( bool show )
 {
     if (!show && IsModal())
     {

-      EndModal( wxID_CANCEL );
+        EndModal( wxID_CANCEL );
+    }
+
+    if (show && !m_sizeSet)
+    {
+        /* by calling GtkOnSize here, we don't have to call
+           either after showing the frame, which would entail
+           much ugly flicker nor from within the size_allocate
+           handler, because GTK 1.1.X forbids that. */
+
+        GtkOnSize( m_x, m_y, m_width, m_height );

     }
 
     wxWindow::Show( show );
     }
 
     wxWindow::Show( show );


@@ -423,17 +461,17 @@ void wxDialog::SetModal( bool WXUNUSED(flag) )
   else
     if (m_windowStyle & wxDIALOG_MODAL) m_windowStyle -= wxDIALOG_MODAL;
 */
   else
     if (m_windowStyle & wxDIALOG_MODAL) m_windowStyle -= wxDIALOG_MODAL;
 */

-    wxFAIL_MSG( "wxDialog:SetModal obsolete now" );
+    wxFAIL_MSG( _T("wxDialog:SetModal obsolete now") );

 }
 
 int wxDialog::ShowModal()
 {
     if (IsModal())
     {
 }
 
 int wxDialog::ShowModal()
 {
     if (IsModal())
     {

-       wxFAIL_MSG( "wxDialog:ShowModal called twice" );
+       wxFAIL_MSG( _T("wxDialog:ShowModal called twice") );

        return GetReturnCode();
     }
        return GetReturnCode();
     }

-    
+

     Show( TRUE );
 
     m_modalShowing = TRUE;
     Show( TRUE );
 
     m_modalShowing = TRUE;


@@ -451,7 +489,7 @@ void wxDialog::EndModal( int retCode )
 
     if (!IsModal())
     {
 
     if (!IsModal())
     {

-        wxFAIL_MSG( "wxDialog:EndModal called twice" );
+        wxFAIL_MSG( _T("wxDialog:EndModal called twice") );

         return;
     }
 
         return;
     }