compile fixes for EMX
minor doc updates minor fixes for problems with rdrag and ldrag in tree ctrl and list ctrl git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -669,7 +669,11 @@ int wxEntry( int argc, char *argv[] )
|
||||
{
|
||||
gtk_set_locale();
|
||||
|
||||
#if wxUSE_WCHAR_T
|
||||
if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
|
||||
#else
|
||||
if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
|
||||
#endif
|
||||
|
||||
gtk_init( &argc, &argv );
|
||||
|
||||
|
@@ -732,6 +732,7 @@ void wxMenu::AppendSeparator()
|
||||
m_items.Append( mitem );
|
||||
}
|
||||
|
||||
#if (GTK_MINOR_VERSION > 0)
|
||||
static char* GetHotKey( const wxString &hotkey, char *hotbuf )
|
||||
{
|
||||
if (hotkey.IsEmpty()) return (char*) NULL;
|
||||
@@ -769,6 +770,7 @@ static char* GetHotKey( const wxString &hotkey, char *hotbuf )
|
||||
}
|
||||
return (char*) NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool checkable )
|
||||
{
|
||||
|
@@ -71,11 +71,11 @@ bool wxStaticText::Create(wxWindow *parent,
|
||||
justify = GTK_JUSTIFY_LEFT;
|
||||
gtk_label_set_justify(GTK_LABEL(m_widget), justify);
|
||||
|
||||
#if GTK_MINOR_VERSION == 2
|
||||
//#if GTK_MINOR_VERSION == 2
|
||||
// GTK_JUSTIFY_LEFT is 0, RIGHT 1 and CENTER 2
|
||||
static const float labelAlignments[] = { 0.0, 1.0, 0.5 };
|
||||
gtk_misc_set_alignment(GTK_MISC(m_widget), labelAlignments[justify], 0.0);
|
||||
#endif // GTK 1.2.x
|
||||
//#endif // GTK 1.2.x
|
||||
|
||||
GtkRequisition req;
|
||||
(* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
|
||||
|
Reference in New Issue
Block a user