Applied patches for AIX,

  Corrected prop dialog,
  Tabbing in parent top-level-windows no longer possible,

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

diff --git a/include/wx/gtk/win_gtk.h b/include/wx/gtk/win_gtk.h
index f12bc34655658bf7193e91b9846474b4257b45be..e48944e75fe4a3760c6fcdf35b19edc11373ce1f 100644 (file)
--- a/include/wx/gtk/win_gtk.h
+++ b/include/wx/gtk/win_gtk.h
@@ -31,7 +31,7 @@ typedef enum
   GTK_MYSHADOW_NONE,
   GTK_MYSHADOW_THIN,
   GTK_MYSHADOW_IN,
   GTK_MYSHADOW_NONE,
   GTK_MYSHADOW_THIN,
   GTK_MYSHADOW_IN,

-  GTK_MYSHADOW_OUT,
+  GTK_MYSHADOW_OUT

 } GtkMyShadowType;
 
 typedef struct _GtkMyFixed        GtkMyFixed;
 } GtkMyShadowType;
 
 typedef struct _GtkMyFixed        GtkMyFixed;

diff --git a/include/wx/gtk1/win_gtk.h b/include/wx/gtk1/win_gtk.h
index f12bc34655658bf7193e91b9846474b4257b45be..e48944e75fe4a3760c6fcdf35b19edc11373ce1f 100644 (file)
--- a/include/wx/gtk1/win_gtk.h
+++ b/include/wx/gtk1/win_gtk.h
@@ -31,7 +31,7 @@ typedef enum
   GTK_MYSHADOW_NONE,
   GTK_MYSHADOW_THIN,
   GTK_MYSHADOW_IN,
   GTK_MYSHADOW_NONE,
   GTK_MYSHADOW_THIN,
   GTK_MYSHADOW_IN,

-  GTK_MYSHADOW_OUT,
+  GTK_MYSHADOW_OUT

 } GtkMyShadowType;
 
 typedef struct _GtkMyFixed        GtkMyFixed;
 } GtkMyShadowType;
 
 typedef struct _GtkMyFixed        GtkMyFixed;

diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp
index 93536a6b4dcf564a33e78be1648e49a4ec83c183..28d2a98225dc2b374b2ec63c6d7291eb25de0dd7 100644 (file)
--- a/samples/minimal/minimal.cpp
+++ b/samples/minimal/minimal.cpp
@@ -86,7 +86,7 @@ enum
 {
     // menu items
     Minimal_Quit = 1,
 {
     // menu items
     Minimal_Quit = 1,

-    Minimal_About,
+    Minimal_About

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------

diff --git a/samples/proplist/test.cpp b/samples/proplist/test.cpp
index 3af946119a02c18819fe66a2c92cb1a2c5c35e23..a63a1e042520ee939f9b9921269edcd4678350ac 100644 (file)
--- a/samples/proplist/test.cpp
+++ b/samples/proplist/test.cpp
@@ -166,6 +166,7 @@ void MyApp::PropertyListTest(bool useDialog)
 
   wxPropertyListView *view =
     new wxPropertyListView(NULL,
 
   wxPropertyListView *view =
     new wxPropertyListView(NULL,

+     wxPROP_BUTTON_OK | wxPROP_BUTTON_CANCEL |

      wxPROP_BUTTON_CHECK_CROSS|wxPROP_DYNAMIC_VALUE_FIELD|wxPROP_PULLDOWN|wxPROP_SHOWVALUES);
 
   wxDialog *propDialog = NULL;
      wxPROP_BUTTON_CHECK_CROSS|wxPROP_DYNAMIC_VALUE_FIELD|wxPROP_PULLDOWN|wxPROP_SHOWVALUES);
 
   wxDialog *propDialog = NULL;

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index 83178ea59bc23b4319fcf58f072a95f17ba18949..55677f10ff7861e21334faaec4b4aa210b20b712 100644 (file)
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -44,6 +44,7 @@ limitation)
 #include "wx/url.h"
 #include "wx/filesys.h"
 #include "wx/fs_inet.h"
 #include "wx/url.h"
 #include "wx/filesys.h"
 #include "wx/fs_inet.h"

+#include "wx/module.h"

 
 class wxInetCacheNode : public wxObject
 {
 
 class wxInetCacheNode : public wxObject
 {

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 2ed8f5148cc0c12ad711faacae7a9f58a71bbba1..567a882de60f34078e75c910ef1a05415ebed5c2 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -129,6 +129,10 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
            wxWindow *focussed_child_of_p = this;
             for ( wxWindow *p = GetParent(); p; p = p->GetParent() )
             {
            wxWindow *focussed_child_of_p = this;
             for ( wxWindow *p = GetParent(); p; p = p->GetParent() )
             {

+               // we don't want to tab into a different dialog or frame
+               if ( focussed_child_of_p->IsTopLevel() )
+                   break;
+                   

                 if ( wxDynamicCast(p, wxPanel) )
                 {
                    event.SetCurrentFocus( focussed_child_of_p );
                 if ( wxDynamicCast(p, wxPanel) )
                 {
                    event.SetCurrentFocus( focussed_child_of_p );

diff --git a/src/generic/proplist.cpp b/src/generic/proplist.cpp
index af0a32a664072996fcedbc5057fde0ab12e723b3..399a81944929a27a75a37a0e43091f091bed7217 100644 (file)
--- a/src/generic/proplist.cpp
+++ b/src/generic/proplist.cpp
@@ -420,7 +420,7 @@ bool wxPropertyListView::CreateControls()
 {
     wxPanel *panel = (wxPanel *)m_propertyWindow;
 
 {
     wxPanel *panel = (wxPanel *)m_propertyWindow;
 

-    wxSize largeButtonSize( 60, 25 );
+    wxSize largeButtonSize( 70, 25 );

     wxSize smallButtonSize( 23, 23 );
 
     if (m_valueText)
     wxSize smallButtonSize( 23, 23 );
 
     if (m_valueText)


@@ -511,7 +511,7 @@ bool wxPropertyListView::CreateControls()
             m_windowCloseButton = new wxButton(panel, wxID_OK, _("OK"), wxPoint(-1, -1), largeButtonSize );
             m_windowCloseButton->SetDefault();
             m_windowCloseButton->SetFocus();
             m_windowCloseButton = new wxButton(panel, wxID_OK, _("OK"), wxPoint(-1, -1), largeButtonSize );
             m_windowCloseButton->SetDefault();
             m_windowCloseButton->SetFocus();

-            bottomsizer->Add( m_windowCloseButton, 0, wxLEFT|wxTOP|wxBOTTOM, buttonborder );
+            bottomsizer->Add( m_windowCloseButton, 0, wxALL, buttonborder );

         }
         else if (m_buttonFlags & wxPROP_BUTTON_CLOSE)
         {
         }
         else if (m_buttonFlags & wxPROP_BUTTON_CLOSE)
         {


@@ -529,7 +529,7 @@ bool wxPropertyListView::CreateControls()
             bottomsizer->Add( m_windowHelpButton, 0, wxALL, buttonborder );
         }
 
             bottomsizer->Add( m_windowHelpButton, 0, wxALL, buttonborder );
         }
 

-        mainsizer->Add( bottomsizer, 1, wxALIGN_RIGHT | wxEXPAND );
+        mainsizer->Add( bottomsizer, 0, wxALIGN_RIGHT | wxEXPAND );

     }
 
     panel->SetSizer( mainsizer );
     }
 
     panel->SetSizer( mainsizer );