SOURCES: ldapexplorertool-inc-path.patch (NEW), ldapexplorertool-w...

[wolvverine]

Author: wolvverine                   Date: Sat Feb  2 03:12:28 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- for 2.0.1

---- Files affected:
SOURCES:
   ldapexplorertool-inc-path.patch (NONE -> 1.1)  (NEW), ldapexplorertool-wx28.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/ldapexplorertool-inc-path.patch
diff -u /dev/null SOURCES/ldapexplorertool-inc-path.patch:1.1
--- /dev/null	Sat Feb  2 04:12:28 2008
+++ SOURCES/ldapexplorertool-inc-path.patch	Sat Feb  2 04:12:23 2008
@@ -0,0 +1,12 @@
+diff -uNr ldapexplorertool-2.0.1.orig/GNUmakefile.config ldapexplorertool-2.0.1/GNUmakefile.config
+--- ldapexplorertool-2.0.1.orig/GNUmakefile.config	2006-11-28 20:17:26.000000000 +0000
++++ ldapexplorertool-2.0.1/GNUmakefile.config	2008-01-31 20:46:49.000000000 +0000
+@@ -37,7 +37,7 @@
+ 
+ 
+ # Specific to my install of OpenLDAP / MinGw
+-LDAP_INC=-I/usr/local/include
++LDAP_INC=-I/usr/include
+ #LDAP_INC=-I/usr/include
+ 
+ ################################################

================================================================
Index: SOURCES/ldapexplorertool-wx28.patch
diff -u /dev/null SOURCES/ldapexplorertool-wx28.patch:1.1
--- /dev/null	Sat Feb  2 04:12:28 2008
+++ SOURCES/ldapexplorertool-wx28.patch	Sat Feb  2 04:12:23 2008
@@ -0,0 +1,48 @@
+--- ldapexplorertool-2.0.1/src/newentrydlg.cc	2006/11/17 22:08:26	60
++++ ldapexplorertool-2.0.1/src/newentrydlg.cc	2007/09/14 19:49:42	89
+@@ -31,7 +31,9 @@
+ EVT_MENU(XRCID( "value_del" ), NewEntryDlg::OnDelValue )
+ EVT_MENU(XRCID( "delete_attribute" ), NewEntryDlg::OnDeleteAttribute )
+ EVT_BUTTON( XRCID( "button_save" ), NewEntryDlg::OnSave )
++#if wxMAJOR_VERSION==2 && wxMINOR_VERSION<8
+ EVT_BUTTON( XRCID( "button_cancel" ), NewEntryDlg::OnCancel )
++#endif
+ EVT_BUTTON( XRCID( "button_add" ), NewEntryDlg::OnManualAdd )
+ 
+ END_EVENT_TABLE()
+@@ -40,7 +42,10 @@
+ 
+ NewEntryDlg::NewEntryDlg( wxWindow* p_Parent, const wxString& p_ParentDn, SchemaUtil& p_Ldap ) 
+ {
+-	
++#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 8
++	//SetAffirmativeId( XRCID("") );
++	SetEscapeId( XRCID("button_cancel") );
++#endif
+ 	int	Err ;
+ 	wxXmlResource::Get()->LoadDialog( this, p_Parent, wxT( "entry_create" ) );
+ 	InitControls();
+--- ldapexplorertool-2.0.1/src/attribute_add_dlg.cc	2006/11/17 22:08:26	60
++++ ldapexplorertool-2.0.1/src/attribute_add_dlg.cc	2007/09/14 19:49:42	89
+@@ -22,7 +22,9 @@
+ 
+ BEGIN_EVENT_TABLE( Attribute_Add_Dlg, wxDialog )
+ EVT_BUTTON( XRCID( "button_save" ), Attribute_Add_Dlg::OnSave )
++#if wxMAJOR_VERSION==2 && wxMINOR_VERSION<8
+ EVT_BUTTON( XRCID( "button_cancel" ), Attribute_Add_Dlg::OnCancel )
++#endif
+ 
+ END_EVENT_TABLE()
+ 
+@@ -30,6 +32,11 @@
+ 
+ Attribute_Add_Dlg::Attribute_Add_Dlg( wxWindow* p_Parent, const wxString& p_Dn, const wxString& p_ObjectClass, SchemaUtil& p_Ldap )
+ {
++#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 8
++	//SetAffirmativeId( XRCID("") );
++	SetEscapeId( XRCID("button_cancel") );
++#endif
++
+ 	int	Err ;
+ 	wxXmlResource::Get()->LoadDialog( this, p_Parent, wxT( "attribute_add" ) );
+ 	InitControls();
================================================================