ecere: Made nativeDecorations default on MessageBox; ide: Took out setting master...

diff --git a/ecere/src/gui/dialogs/MessageBox.ec b/ecere/src/gui/dialogs/MessageBox.ec
index 242c34c..60e092b 100644 (file)
--- a/ecere/src/gui/dialogs/MessageBox.ec
+++ b/ecere/src/gui/dialogs/MessageBox.ec
@@ -15,6 +15,7 @@ public class MessageBox : Window
    background = activeBorder;
    hasClose = true;
    tabCycle = true;
+   nativeDecorations = true;
 
 public:
    property MessageBoxType type { set { style = value; } };

diff --git a/ide/src/dialogs/GlobalSettingsDialog.ec b/ide/src/dialogs/GlobalSettingsDialog.ec
index c655893..aae411f 100644 (file)
--- a/ide/src/dialogs/GlobalSettingsDialog.ec
+++ b/ide/src/dialogs/GlobalSettingsDialog.ec
@@ -18,6 +18,7 @@ class GlobalSettingsDialog : Window
    borderStyle = sizable;
    text = "Global Settings";
    minClientSize = { 560, 420 };
+   nativeDecorations = true;
 
    IDESettings ideSettings;
    IDESettingsContainer settingsContainer;

diff --git a/ide/src/ide.ec b/ide/src/ide.ec
index 1aad023..0416cce 100644 (file)
--- a/ide/src/ide.ec
+++ b/ide/src/ide.ec
@@ -517,7 +517,7 @@ class IDE : Window
                         gotWhatWeWant = true;
                   }
                   if(gotWhatWeWant ||
-                     MessageBox { type = yesNo, master = this, text = "Error opening file", 
+                     MessageBox { type = yesNo, /*master = this, */text = "Error opening file", 
                      contents = "Open a different file?" }.Modal() == no)
                   {
                      if(!projectView && gotWhatWeWant)
@@ -563,7 +563,7 @@ class IDE : Window
          fileMenu, "Global Settings...", g;
          bool NotifySelect(MenuItem selection, Modifiers mods)
          {
-            globalSettingsDialog.master = this;
+            // globalSettingsDialog.master = this;
             if(ide.workspace && ide.workspace.compiler)
                globalSettingsDialog.workspaceActiveCompiler = ide.workspace.compiler;
             else if(ideSettings.defaultCompiler)
@@ -681,7 +681,7 @@ class IDE : Window
                {
                   if(OpenFile(ideProjectFileDialog.filePath, normal, true, projectTypes[ideProjectFileDialog.fileType].typeExtension, no, add))
                      break;
-                  if(MessageBox { type = yesNo, master = this, text = "Error opening project file", 
+                  if(MessageBox { type = yesNo, /*master = this, */text = "Error opening project file", 
                         contents = "Add a different project?" }.Modal() == no)
                   {
                      break;
@@ -1138,7 +1138,7 @@ class IDE : Window
          helpMenu, "About...", a;
          bool NotifySelect(MenuItem selection, Modifiers mods)
          {
-            AboutIDE { master = this }.Modal();
+            AboutIDE { /*master = this */}.Modal();
             return true;
          }
       }
@@ -1349,7 +1349,7 @@ class IDE : Window
       char temp[4096];
       sprintf(temp, "The document %s was modified by another application.\n"
             "Would you like to reload it and lose your changes?", this.fileName);
-      if(MessageBox { type = yesNo, master = this/*.parent*/,
+      if(MessageBox { type = yesNo/*, master = this*//*.parent*/,
             text = "Document has been modified", contents = temp }.Modal() == yes)
       {
          char * fileName = CopyString(this.fileName);
@@ -1501,7 +1501,7 @@ class IDE : Window
    {
       if(debugger.isActive)
       {
-         if(MessageBox { type = yesNo, master = ide, 
+         if(MessageBox { type = yesNo, /*master = ide, */
                            contents = "Do you want to terminate the debugging session in progress?", 
                            text = title }.Modal() == no)
             return true;
@@ -1689,7 +1689,7 @@ class IDE : Window
                }
                if(prj)
                {
-                  MessageBox { type = ok, parent = parent, master = this, text = "Same Project", 
+                  MessageBox { type = ok, parent = parent, /*master = this, */text = "Same Project", 
                         contents = "This project is already present in workspace." }.Modal();
                }
                else
@@ -2436,9 +2436,9 @@ class IDE : Window
          skinItems[c].id = c;
          skinItems[c].isRadio = true;         
       }
-*/
+*/    /*
       ideFileDialog.master = this;
-      ideProjectFileDialog.master = this;
+      ideProjectFileDialog.master = this;*/
 
       //SetDriverAndSkin();
       return true;