wxGetUserHome() returns "const wxMB2WXbuf" for Unix in Unicode build.

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

diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index 6f8cefcb3c812da30a296195b52bcaec8a373760..deab62ab69a219b290db49fd5a0d779d3cd4ff4a 100644 (file)
--- a/src/gtk1/dialog.cpp
+++ b/src/gtk1/dialog.cpp
@@ -145,26 +145,28 @@ bool wxDialog::Create( wxWindow *parent,
 
     gtk_widget_realize( m_widget );
 
 
     gtk_widget_realize( m_widget );
 

-      long decor = (long) GDK_DECOR_ALL;
-      long func = (long) GDK_FUNC_ALL;
-      
-      if ((m_windowStyle & wxCAPTION) == 0)
+    /* 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;
        decor |= GDK_DECOR_TITLE;

-      if ((m_windowStyle & wxMINIMIZE) == 0)
+/*
+    if ((m_windowStyle & wxMINIMIZE) == 0)

        func |= GDK_FUNC_MINIMIZE;
        func |= GDK_FUNC_MINIMIZE;

-      if ((m_windowStyle & wxMAXIMIZE) == 0)
+    if ((m_windowStyle & wxMAXIMIZE) == 0)

        func |= GDK_FUNC_MAXIMIZE;
        func |= GDK_FUNC_MAXIMIZE;

-      if ((m_windowStyle & wxSYSTEM_MENU) == 0)
+*/
+    if ((m_windowStyle & wxSYSTEM_MENU) == 0)

        decor |= GDK_DECOR_MENU;
        decor |= GDK_DECOR_MENU;

-      if ((m_windowStyle & wxMINIMIZE_BOX) == 0)
+    if ((m_windowStyle & wxMINIMIZE_BOX) == 0)

        decor |= GDK_DECOR_MINIMIZE;
        decor |= GDK_DECOR_MINIMIZE;

-      if ((m_windowStyle & wxMAXIMIZE_BOX) == 0)
+    if ((m_windowStyle & wxMAXIMIZE_BOX) == 0)

        decor |= GDK_DECOR_MAXIMIZE;
        decor |= GDK_DECOR_MAXIMIZE;

-      if ((m_windowStyle & wxRESIZE_BORDER) == 0)
+    if ((m_windowStyle & wxRESIZE_BORDER) == 0)

        func |= GDK_FUNC_RESIZE;
        func |= GDK_FUNC_RESIZE;

-
-      gdk_window_set_decorations(m_widget->window, (GdkWMDecoration)decor);
-      gdk_window_set_functions(m_widget->window, (GdkWMFunction)func);
+    gdk_window_set_decorations(m_widget->window, (GdkWMDecoration)decor);
+    gdk_window_set_functions(m_widget->window, (GdkWMFunction)func);

       
     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 );


@@ -193,8 +195,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


@@ -257,17 +259,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()


@@ -279,7 +281,7 @@ bool wxDialog::Destroy()
 
 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())
     {


@@ -312,8 +314,8 @@ void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) )
 
 void wxDialog::DoSetSize( 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 dialog" );
-    wxASSERT_MSG( (m_wxwindow != NULL), "invalid dialog" );
+    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 */
     m_resizing = TRUE;
 
     if (m_resizing) return; /* I don't like recursions */
     m_resizing = TRUE;


@@ -399,7 +401,7 @@ void wxDialog::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int heigh
 
 void wxDialog::Centre( int direction )
 {
 
 void wxDialog::Centre( int direction )
 {

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

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


@@ -453,14 +455,14 @@ 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();
     }
 


@@ -481,7 +483,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;
     }