corrected wxListCtrl compilation problems

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

diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index 1756334f0c46e9ebb092ca24e1016c9b7540c3e9..6ce4890d799e8677f8295d508412093130223f94 100644 (file)
--- a/src/gtk1/dialog.cpp
+++ b/src/gtk1/dialog.cpp
@@ -17,6 +17,10 @@
 #include "wx/app.h"
 #include "wx/gtk/win_gtk.h"
 
 #include "wx/app.h"
 #include "wx/gtk/win_gtk.h"
 

+//-----------------------------------------------------------------------------
+
+extern wxList wxPendingDelete;
+

 //-----------------------------------------------------------------------------
 // delete
 
 //-----------------------------------------------------------------------------
 // delete
 


@@ -32,14 +36,14 @@ bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED
   win->Close();
 
   return TRUE;
   win->Close();
 
   return TRUE;

-};
+}

 
 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(wxDialog,wxWindow)
 
 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(wxDialog,wxWindow)

-  EVT_BUTTON  (wxID_OK,       wxDialog::OnOk)
+  EVT_BUTTON  (wxID_OK,       wxDialog::OnOK)

   EVT_BUTTON  (wxID_CANCEL,   wxDialog::OnCancel)
   EVT_BUTTON  (wxID_APPLY,    wxDialog::OnApply)
   EVT_CLOSE   (wxDialog::OnCloseWindow)
   EVT_BUTTON  (wxID_CANCEL,   wxDialog::OnCancel)
   EVT_BUTTON  (wxID_APPLY,    wxDialog::OnApply)
   EVT_CLOSE   (wxDialog::OnCloseWindow)


@@ -50,18 +54,19 @@ IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxWindow)
 wxDialog::wxDialog(void)
 {
   m_title = "";
 wxDialog::wxDialog(void)
 {
   m_title = "";

-  m_modalShowing = TRUE;
+  m_modalShowing = FALSE;

   wxTopLevelWindows.Insert( this );
   wxTopLevelWindows.Insert( this );

-};
+}

 
 wxDialog::wxDialog( wxWindow *parent, 
       wxWindowID id, const wxString &title,
       const wxPoint &pos, const wxSize &size, 
       long style, const wxString &name )
 {
 
 wxDialog::wxDialog( wxWindow *parent, 
       wxWindowID id, const wxString &title,
       const wxPoint &pos, const wxSize &size, 
       long style, const wxString &name )
 {

+  m_modalShowing = FALSE;

   wxTopLevelWindows.Insert( this );
   Create( parent, id, title, pos, size, style, name );
   wxTopLevelWindows.Insert( this );
   Create( parent, id, title, pos, size, style, name );

-};
+}

 
 bool wxDialog::Create( wxWindow *parent,
       wxWindowID id, const wxString &title,
 
 bool wxDialog::Create( wxWindow *parent,
       wxWindowID id, const wxString &title,


@@ -72,8 +77,6 @@ bool wxDialog::Create( wxWindow *parent,
   
   PreCreation( parent, id, pos, size, style, name );
   
   
   PreCreation( parent, id, pos, size, style, name );
   

-  m_modalShowing = ((m_windowStyle & wxDIALOG_MODAL) == wxDIALOG_MODAL);
-  

   m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL );
   GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
  
   m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL );
   GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
  


@@ -90,70 +93,79 @@ 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 );
+     
+  gtk_widget_set_usize( m_widget, m_width, m_height );
+     

   PostCreation();
   
   return TRUE;
   PostCreation();
   
   return TRUE;

-};
+}

 
 wxDialog::~wxDialog(void)
 {
   wxTopLevelWindows.DeleteObject( this );
   if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop();
 
 wxDialog::~wxDialog(void)
 {
   wxTopLevelWindows.DeleteObject( this );
   if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop();

-};
+}

 
 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 );
   gtk_window_set_title( GTK_WINDOW(m_widget), m_title );

-};
+}

 
 wxString wxDialog::GetTitle(void) const
 {
   return (wxString&)m_title;
 
 wxString wxDialog::GetTitle(void) const
 {
   return (wxString&)m_title;

-};
+}

 
 void wxDialog::OnApply( wxCommandEvent &WXUNUSED(event) )
 {
   if (Validate()) TransferDataFromWindow();
 
 void wxDialog::OnApply( wxCommandEvent &WXUNUSED(event) )
 {
   if (Validate()) TransferDataFromWindow();

-};
+}

 
 void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) )
 {
   if (IsModal())
 
 void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) )
 {
   if (IsModal())

+  {

     EndModal(wxID_CANCEL);
     EndModal(wxID_CANCEL);

+  }

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

-  };
-};
+  }
+}

 
 

-void wxDialog::OnOk( wxCommandEvent &WXUNUSED(event) )
+void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )

 {
   if ( Validate() && TransferDataFromWindow())
   {
     if (IsModal()) 
 {
   if ( Validate() && TransferDataFromWindow())
   {
     if (IsModal()) 

+    {

       EndModal(wxID_OK);
       EndModal(wxID_OK);

+    }

     else
     {
       SetReturnCode(wxID_OK);
       this->Show(FALSE);
     else
     {
       SetReturnCode(wxID_OK);
       this->Show(FALSE);

-    };
-  };
-  EndModal( wxID_OK );
-};
+    }
+  }
+}

 
 void wxDialog::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
   // yes
 
 void wxDialog::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
   // yes

-};
+}

 
 bool wxDialog::OnClose(void)
 {
   static wxList closing;
 
   if (closing.Member(this)) return FALSE;   // no loops
 
 bool wxDialog::OnClose(void)
 {
   static wxList closing;
 
   if (closing.Member(this)) return FALSE;   // no loops

-
+  

   closing.Append(this);
 
   wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
   closing.Append(this);
 
   wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);


@@ -164,49 +176,108 @@ bool wxDialog::OnClose(void)
   return FALSE;
 }
 
   return FALSE;
 }
 

+bool wxDialog::Destroy(void)
+{
+  if (!wxPendingDelete.Member(this))
+    wxPendingDelete.Append(this);
+
+  return TRUE;
+}
+

 void wxDialog::OnCloseWindow(wxCloseEvent& event)
 {
   if (GetEventHandler()->OnClose() || event.GetForce())
   {
     this->Destroy();
 void wxDialog::OnCloseWindow(wxCloseEvent& event)
 {
   if (GetEventHandler()->OnClose() || event.GetForce())
   {
     this->Destroy();

-  };
-};
+  }
+}
+
+void wxDialog::ImplementSetPosition(void)
+{
+  if ((m_x != -1) || (m_y != -1))
+     gtk_widget_set_uposition( m_widget, m_x, m_y );
+}
+
+void wxDialog::Centre( int direction )
+{
+  if (direction & wxHORIZONTAL == wxHORIZONTAL) m_x = (gdk_screen_width () - m_width) / 2;
+  if (direction & wxVERTICAL == wxVERTICAL) m_y = (gdk_screen_height () - m_height) / 2;
+  ImplementSetPosition();
+}

 
 bool wxDialog::Show( bool show )
 {
 
 bool wxDialog::Show( bool show )
 {

-  if (!show && m_modalShowing)
+  if (!show && IsModal() && m_modalShowing)

   {
     EndModal( wxID_CANCEL );
   {
     EndModal( wxID_CANCEL );

-  };
+  }

 
   wxWindow::Show( show );
   
   if (show) InitDialog();
   
 
   wxWindow::Show( show );
   
   if (show) InitDialog();
   

-  if (show && m_modalShowing)
-  {
-    gtk_grab_add( m_widget );
-    gtk_main();
-    gtk_grab_remove( m_widget );
-  };
-  

   return TRUE;
   return TRUE;

-};
+}
+
+void wxDialog::SetModal(bool flag)
+{
+  if (flag)
+    m_windowStyle |= wxDIALOG_MODAL;
+  else
+    if (m_windowStyle & wxDIALOG_MODAL) m_windowStyle -= wxDIALOG_MODAL;
+}

 
 int wxDialog::ShowModal(void)
 {
 
 int wxDialog::ShowModal(void)
 {

+  if (m_modalShowing) return GetReturnCode();
+

   Show( TRUE );
   Show( TRUE );

+  
+  m_modalShowing = TRUE;
+  
+  gtk_grab_add( m_widget );
+  gtk_main();
+  gtk_grab_remove( m_widget );
+  

   return GetReturnCode();
   return GetReturnCode();

-};
+}

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

-  gtk_main_quit();

   SetReturnCode( retCode );
   SetReturnCode( retCode );

-};
+  
+  if (!m_modalShowing)
+  {
+     wxFAIL_MSG( "wxDialog: called EndModal twice" );
+     return;
+  }
+  
+  m_modalShowing = FALSE;
+  
+  gtk_main_quit();
+}

 
 void wxDialog::InitDialog(void)
 {
   wxWindow::InitDialog();
 
 void wxDialog::InitDialog(void)
 {
   wxWindow::InitDialog();

-};
+}
+
+void wxDialog::SetSizeHints(int minW, int minH, int maxW, int maxH, int WXUNUSED(incW) )
+{
+  gdk_window_set_hints( m_widget->window, -1, -1, 
+                       minW, minH, maxW, maxH, GDK_HINT_MIN_SIZE | GDK_HINT_MIN_SIZE );
+}
+
+void wxDialog::SetIcon( const wxIcon &icon )
+{
+  m_icon = icon;
+  if (!icon.Ok()) return;
+  
+  wxMask *mask = icon.GetMask();
+  GdkBitmap *bm = NULL;
+  if (mask) bm = mask->GetBitmap();
+  
+  gdk_window_set_icon( m_widget->window, NULL, icon.GetPixmap(), bm );
+}
+