Found mem leaks (except one)

  Next take at focus vs. keyboard input probs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 418183b6e412ba26f5978c45e048c6add2104863..78511d556f0c1278e634011794a2f5d7005e1550 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -451,6 +451,12 @@ void wxApp::CleanUp(void)
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 
+    wxSystemSettings::Done();
+    
+    delete[] wxBuffer;
+
+    wxClassInfo::CleanUpClasses();
+    
     /* check for memory leaks */
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     if (wxDebugContext::CountObjectsLeft() > 0)
@@ -466,12 +472,6 @@ void wxApp::CleanUp(void)
     
     wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL );
     if (oldLog) delete oldLog;
-
-    wxSystemSettings::Done();
-    
-    wxClassInfo::CleanUpClasses();
-
-    delete[] wxBuffer;
 }
 
 wxLog *wxApp::CreateLogTarget()

diff --git a/src/gtk/utilsres.cpp b/src/gtk/utilsres.cpp
index fe447a9b1a7ac44f6885d6666ec91c6b68babe4d..52e3199178c3e31ff251b6e9f3571a45aedbfb63 100644 (file)
--- a/src/gtk/utilsres.cpp
+++ b/src/gtk/utilsres.cpp
@@ -57,19 +57,22 @@ extern XrmDatabase wxResourceDatabase;
 
 static char *GetResourcePath(char *buf, char *name, bool create)
 {
-    if (create && FileExists(name)) {
+    if (create && FileExists(name)) 
+    {
         strcpy(buf, name);
         return buf; // Exists so ...
     }
     if (*name == '/')
         strcpy(buf, name);
-    else {
+    else 
+    {
         // Put in standard place for resource files if not absolute
         strcpy(buf, DEFAULT_XRESOURCE_DIR);
         strcat(buf, "/");
         strcat(buf, FileNameFromPath(name));
     }
-    if (create) {
+    if (create) 
+    {
         // Touch the file to create it
         FILE *fd = fopen(buf, "w");
         if (fd) fclose(fd);
@@ -129,9 +132,12 @@ static void wxXMergeDatabases()
     // window when the server initializes and loaded into the display
     // structure on XOpenDisplay;
     // if not defined, use .Xdefaults
-    if (XResourceManagerString(GDK_DISPLAY()) != NULL) {
+    if (XResourceManagerString(GDK_DISPLAY()) != NULL) 
+    {
         serverDB = XrmGetStringDatabase(XResourceManagerString(GDK_DISPLAY()));
-    } else {
+    } 
+    else 
+    {
         (void)GetIniFile(filename, (char *) NULL);
         serverDB = XrmGetFileDatabase(filename);
     }
@@ -141,7 +147,8 @@ static void wxXMergeDatabases()
     // Open XENVIRONMENT file, or if not defined, the .Xdefaults,
     // and merge into existing database
 
-    if ((environment = getenv("XENVIRONMENT")) == NULL) {
+    if ((environment = getenv("XENVIRONMENT")) == NULL) 
+    {
         size_t len;
         environment = GetIniFile(filename, (const char *) NULL);
         len = strlen(environment);
@@ -249,7 +256,8 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
         wxXMergeDatabases();
 
     XrmDatabase database;
-    if ( !file.IsEmpty() ) {
+    if (!file.IsEmpty()) 
+    {
         char buffer[500];
         // Is this right? Trying to get it to look in the user's
         // home directory instead of current directory -- JACS
@@ -279,11 +287,13 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
 
     bool success = XrmGetResource(database, buf, "*", str_type, &xvalue);
     // Try different combinations of upper/lower case, just in case...
-    if (!success) {
+    if (!success) 
+    {
         buf[0] = (isupper(buf[0]) ? tolower(buf[0]) : toupper(buf[0]));
         success = XrmGetResource(database, buf, "*", str_type,        &xvalue);
     }
-    if (success) {
+    if (success) 
+    {
         if (*value)
             delete[] *value;
         *value = new char[xvalue.size + 1];
@@ -297,7 +307,8 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value,
 {
     char *s = (char *) NULL;
     bool succ = wxGetResource(section, entry, &s, file);
-    if (succ) {
+    if (succ) 
+    {
         *value = (float)strtod(s, (char **) NULL);
         delete[]s;
         return TRUE;
@@ -309,7 +320,8 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value,
 {
     char *s = (char *) NULL;
     bool succ = wxGetResource(section, entry, &s, file);
-    if (succ) {
+    if (succ) 
+    {
         *value = strtol(s, (char **) NULL, 10);
         delete[]s;
         return TRUE;
@@ -321,7 +333,8 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
 {
     char *s = (char *) NULL;
     bool succ = wxGetResource(section, entry, &s, file);
-    if (succ) {
+    if (succ) 
+    {
         // Handle True, False here
         // True, Yes, Enables, Set or  Activated
         if (*s == 'T' || *s == 'Y' || *s == 'E' || *s == 'S' || *s == 'A')

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 3f465179075fb8fa7dff6d3ce50af10351cf4396..9b1cb42717c226fffd6d0466eb5961028f268ce3 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -1257,6 +1257,13 @@ static void wxInsertChildInWindow( wxWindow* parent, wxWindow* child )
     {
         parent->m_sizeSet = FALSE;
     }
+    
+    if (parent->m_windowStyle & wxTAB_TRAVERSAL)
+    {
+        /* we now allow a window to get the focus as long as it
+          doesn't have any children. */
+        GTK_WIDGET_UNSET_FLAGS( parent->m_wxwindow, GTK_CAN_FOCUS );  
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -1421,9 +1428,11 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
         gtk_viewport_set_shadow_type( viewport, GTK_SHADOW_NONE );
     }
 
-    if ((m_windowStyle & wxTAB_TRAVERSAL) != 0)
+    if (m_windowStyle & wxTAB_TRAVERSAL)
     {
-        GTK_WIDGET_SET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );  /* changed from UNSET */
+        /* we now allow a window to get the focus as long as it
+          doesn't have any children. */
+        GTK_WIDGET_SET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );  
         m_acceptsFocus = FALSE;
     }
     else

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 418183b6e412ba26f5978c45e048c6add2104863..78511d556f0c1278e634011794a2f5d7005e1550 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -451,6 +451,12 @@ void wxApp::CleanUp(void)
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 
+    wxSystemSettings::Done();
+    
+    delete[] wxBuffer;
+
+    wxClassInfo::CleanUpClasses();
+    
     /* check for memory leaks */
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     if (wxDebugContext::CountObjectsLeft() > 0)
@@ -466,12 +472,6 @@ void wxApp::CleanUp(void)
     
     wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL );
     if (oldLog) delete oldLog;
-
-    wxSystemSettings::Done();
-    
-    wxClassInfo::CleanUpClasses();
-
-    delete[] wxBuffer;
 }
 
 wxLog *wxApp::CreateLogTarget()

diff --git a/src/gtk1/utilsres.cpp b/src/gtk1/utilsres.cpp
index fe447a9b1a7ac44f6885d6666ec91c6b68babe4d..52e3199178c3e31ff251b6e9f3571a45aedbfb63 100644 (file)
--- a/src/gtk1/utilsres.cpp
+++ b/src/gtk1/utilsres.cpp
@@ -57,19 +57,22 @@ extern XrmDatabase wxResourceDatabase;
 
 static char *GetResourcePath(char *buf, char *name, bool create)
 {
-    if (create && FileExists(name)) {
+    if (create && FileExists(name)) 
+    {
         strcpy(buf, name);
         return buf; // Exists so ...
     }
     if (*name == '/')
         strcpy(buf, name);
-    else {
+    else 
+    {
         // Put in standard place for resource files if not absolute
         strcpy(buf, DEFAULT_XRESOURCE_DIR);
         strcat(buf, "/");
         strcat(buf, FileNameFromPath(name));
     }
-    if (create) {
+    if (create) 
+    {
         // Touch the file to create it
         FILE *fd = fopen(buf, "w");
         if (fd) fclose(fd);
@@ -129,9 +132,12 @@ static void wxXMergeDatabases()
     // window when the server initializes and loaded into the display
     // structure on XOpenDisplay;
     // if not defined, use .Xdefaults
-    if (XResourceManagerString(GDK_DISPLAY()) != NULL) {
+    if (XResourceManagerString(GDK_DISPLAY()) != NULL) 
+    {
         serverDB = XrmGetStringDatabase(XResourceManagerString(GDK_DISPLAY()));
-    } else {
+    } 
+    else 
+    {
         (void)GetIniFile(filename, (char *) NULL);
         serverDB = XrmGetFileDatabase(filename);
     }
@@ -141,7 +147,8 @@ static void wxXMergeDatabases()
     // Open XENVIRONMENT file, or if not defined, the .Xdefaults,
     // and merge into existing database
 
-    if ((environment = getenv("XENVIRONMENT")) == NULL) {
+    if ((environment = getenv("XENVIRONMENT")) == NULL) 
+    {
         size_t len;
         environment = GetIniFile(filename, (const char *) NULL);
         len = strlen(environment);
@@ -249,7 +256,8 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
         wxXMergeDatabases();
 
     XrmDatabase database;
-    if ( !file.IsEmpty() ) {
+    if (!file.IsEmpty()) 
+    {
         char buffer[500];
         // Is this right? Trying to get it to look in the user's
         // home directory instead of current directory -- JACS
@@ -279,11 +287,13 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
 
     bool success = XrmGetResource(database, buf, "*", str_type, &xvalue);
     // Try different combinations of upper/lower case, just in case...
-    if (!success) {
+    if (!success) 
+    {
         buf[0] = (isupper(buf[0]) ? tolower(buf[0]) : toupper(buf[0]));
         success = XrmGetResource(database, buf, "*", str_type,        &xvalue);
     }
-    if (success) {
+    if (success) 
+    {
         if (*value)
             delete[] *value;
         *value = new char[xvalue.size + 1];
@@ -297,7 +307,8 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value,
 {
     char *s = (char *) NULL;
     bool succ = wxGetResource(section, entry, &s, file);
-    if (succ) {
+    if (succ) 
+    {
         *value = (float)strtod(s, (char **) NULL);
         delete[]s;
         return TRUE;
@@ -309,7 +320,8 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value,
 {
     char *s = (char *) NULL;
     bool succ = wxGetResource(section, entry, &s, file);
-    if (succ) {
+    if (succ) 
+    {
         *value = strtol(s, (char **) NULL, 10);
         delete[]s;
         return TRUE;
@@ -321,7 +333,8 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
 {
     char *s = (char *) NULL;
     bool succ = wxGetResource(section, entry, &s, file);
-    if (succ) {
+    if (succ) 
+    {
         // Handle True, False here
         // True, Yes, Enables, Set or  Activated
         if (*s == 'T' || *s == 'Y' || *s == 'E' || *s == 'S' || *s == 'A')

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 3f465179075fb8fa7dff6d3ce50af10351cf4396..9b1cb42717c226fffd6d0466eb5961028f268ce3 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -1257,6 +1257,13 @@ static void wxInsertChildInWindow( wxWindow* parent, wxWindow* child )
     {
         parent->m_sizeSet = FALSE;
     }
+    
+    if (parent->m_windowStyle & wxTAB_TRAVERSAL)
+    {
+        /* we now allow a window to get the focus as long as it
+          doesn't have any children. */
+        GTK_WIDGET_UNSET_FLAGS( parent->m_wxwindow, GTK_CAN_FOCUS );  
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -1421,9 +1428,11 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
         gtk_viewport_set_shadow_type( viewport, GTK_SHADOW_NONE );
     }
 
-    if ((m_windowStyle & wxTAB_TRAVERSAL) != 0)
+    if (m_windowStyle & wxTAB_TRAVERSAL)
     {
-        GTK_WIDGET_SET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );  /* changed from UNSET */
+        /* we now allow a window to get the focus as long as it
+          doesn't have any children. */
+        GTK_WIDGET_SET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );  
         m_acceptsFocus = FALSE;
     }
     else