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
This commit is contained in:
@@ -31,7 +31,7 @@ typedef enum
|
||||
GTK_MYSHADOW_NONE,
|
||||
GTK_MYSHADOW_THIN,
|
||||
GTK_MYSHADOW_IN,
|
||||
GTK_MYSHADOW_OUT,
|
||||
GTK_MYSHADOW_OUT
|
||||
} GtkMyShadowType;
|
||||
|
||||
typedef struct _GtkMyFixed GtkMyFixed;
|
||||
|
@@ -31,7 +31,7 @@ typedef enum
|
||||
GTK_MYSHADOW_NONE,
|
||||
GTK_MYSHADOW_THIN,
|
||||
GTK_MYSHADOW_IN,
|
||||
GTK_MYSHADOW_OUT,
|
||||
GTK_MYSHADOW_OUT
|
||||
} GtkMyShadowType;
|
||||
|
||||
typedef struct _GtkMyFixed GtkMyFixed;
|
||||
|
@@ -86,7 +86,7 @@ enum
|
||||
{
|
||||
// menu items
|
||||
Minimal_Quit = 1,
|
||||
Minimal_About,
|
||||
Minimal_About
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -166,6 +166,7 @@ void MyApp::PropertyListTest(bool useDialog)
|
||||
|
||||
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;
|
||||
|
@@ -44,6 +44,7 @@ limitation)
|
||||
#include "wx/url.h"
|
||||
#include "wx/filesys.h"
|
||||
#include "wx/fs_inet.h"
|
||||
#include "wx/module.h"
|
||||
|
||||
class wxInetCacheNode : public wxObject
|
||||
{
|
||||
|
@@ -129,6 +129,10 @@ void wxPanel::OnNavigationKey( wxNavigationKeyEvent& event )
|
||||
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 );
|
||||
|
@@ -420,7 +420,7 @@ bool wxPropertyListView::CreateControls()
|
||||
{
|
||||
wxPanel *panel = (wxPanel *)m_propertyWindow;
|
||||
|
||||
wxSize largeButtonSize( 60, 25 );
|
||||
wxSize largeButtonSize( 70, 25 );
|
||||
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();
|
||||
bottomsizer->Add( m_windowCloseButton, 0, wxLEFT|wxTOP|wxBOTTOM, buttonborder );
|
||||
bottomsizer->Add( m_windowCloseButton, 0, wxALL, buttonborder );
|
||||
}
|
||||
else if (m_buttonFlags & wxPROP_BUTTON_CLOSE)
|
||||
{
|
||||
@@ -529,7 +529,7 @@ bool wxPropertyListView::CreateControls()
|
||||
bottomsizer->Add( m_windowHelpButton, 0, wxALL, buttonborder );
|
||||
}
|
||||
|
||||
mainsizer->Add( bottomsizer, 1, wxALIGN_RIGHT | wxEXPAND );
|
||||
mainsizer->Add( bottomsizer, 0, wxALIGN_RIGHT | wxEXPAND );
|
||||
}
|
||||
|
||||
panel->SetSizer( mainsizer );
|
||||
|
Reference in New Issue
Block a user