[Wxlua-commit] wxLua/bindings/wxwidgets controls.i,1.3,1.4 dialogs.i,1.4,1.5 print.i,1.3,1.4 windows.i,1.4,1.5

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22114/wxLua/bindings/wxwidgets

Modified Files:
	controls.i dialogs.i print.i windows.i 
Log Message:
everything works in wx27/26 the problem was with dialogs.i 


Index: windows.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** windows.i	17 Nov 2005 05:51:20 -0000	1.4
--- windows.i	20 Nov 2005 04:09:46 -0000	1.5
***************
*** 609,615 ****
  %include "wx/stattext.h"
  
- %define wxALIGN_LEFT
- %define wxALIGN_RIGHT
- %define wxALIGN_CENTRE
  %define wxST_NO_AUTORESIZE
  
--- 609,612 ----

Index: controls.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** controls.i	17 Nov 2005 05:51:20 -0000	1.3
--- controls.i	20 Nov 2005 04:09:46 -0000	1.4
***************
*** 723,727 ****
  %wxchkver23 %define wxTE_AUTO_URL
  %wxchkver23 %define wxTE_NOHIDESEL
- %define wxHSCROLL
  %wxchkver23 %define wxTE_LEFT
  %wxchkver23 %define wxTE_CENTRE
--- 723,726 ----

Index: print.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/print.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** print.i	17 Nov 2005 05:51:20 -0000	1.3
--- print.i	20 Nov 2005 04:09:46 -0000	1.4
***************
*** 421,425 ****
  // wxPrinterDC
  
! %if %msw 
  %class %delete wxPrinterDC, wxDC
      %include "wx/dcprint.h"
--- 421,425 ----
  // wxPrinterDC
  
! %if %msw
  %class %delete wxPrinterDC, wxDC
      %include "wx/dcprint.h"

Index: dialogs.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dialogs.i	19 Nov 2005 23:58:49 -0000	1.4
--- dialogs.i	20 Nov 2005 04:09:46 -0000	1.5
***************
*** 32,38 ****
  
  %if wxUSE_NUMBERDLG
! %include "wx/numdlg.h" // FIXME not in 2.4
  %builtin long wxGetNumberFromUser( const wxString& message, const wxString& prompt, const wxString& caption, long value, long min = 0, long max = 100, wxWindow *parent = NULL, const wxPoint& pos = wxDefaultPosition)
! %endif wxUSE_NUMBERDLG
  
  %builtin wxString wxGetPasswordFromUser(const wxString& message, const wxString& caption = "Input text", const wxString& default_value = "", wxWindow *parent = NULL)
--- 32,38 ----
  
  %if wxUSE_NUMBERDLG
! %wxchkver25 %include "wx/numdlg.h" // FIXME not in 2.4
  %builtin long wxGetNumberFromUser( const wxString& message, const wxString& prompt, const wxString& caption, long value, long min = 0, long max = 100, wxWindow *parent = NULL, const wxPoint& pos = wxDefaultPosition)
! %endif // wxUSE_NUMBERDLG
  
  %builtin wxString wxGetPasswordFromUser(const wxString& message, const wxString& caption = "Input text", const wxString& default_value = "", wxWindow *parent = NULL)
***************
*** 53,64 ****
  %define wxDIALOG_MODAL
  %define wxDIALOG_MODELESS
- 
- %define wxCAPTION
  %define wxDEFAULT_DIALOG_STYLE
- %define wxRESIZE_BORDER
- %define wxSYSTEM_MENU
- %define wxTHICK_FRAME
- %define wxSTAY_ON_TOP
- %define wxNO_3D
  %wxchkver23 %define wxDIALOG_NO_PARENT
  %wxchkver23 %define wxDIALOG_EX_CONTEXTHELP
--- 53,57 ----
***************
*** 85,89 ****
  %endclass
  
! %endif wxLUA_USE_wxDialog
  
  ///////////////////////////////////////////////////////////////////////////////
--- 78,82 ----
  %endclass
  
! %endif // wxLUA_USE_wxDialog
  
  ///////////////////////////////////////////////////////////////////////////////
***************
*** 119,123 ****
  %endclass
  
! %endif wxLUA_USE_wxColourDialog
  
  ///////////////////////////////////////////////////////////////////////////////
--- 112,116 ----
  %endclass
  
! %endif // wxLUA_USE_wxColourDialog
  
  ///////////////////////////////////////////////////////////////////////////////
***************
*** 184,192 ****
  %if wxLUA_USE_wxMessageDialog
  
  %win %class wxMessageDialog, wxDialog
- %gtk|%mac %class %noclassinfo wxMessageDialog, wxDialog
      wxMessageDialog(wxWindow* parent, const wxString& message, const wxString& caption = "Message box", long style = wxOK | wxCANCEL | wxCENTRE, const wxPoint& pos = wxDefaultPosition)
      int ShowModal()
  %endclass
  
  %endif wxLUA_USE_wxMessageDialog
--- 177,196 ----
  %if wxLUA_USE_wxMessageDialog
  
+ //%win %class wxMessageDialog, wxDialog FIXME THIS DOES NOT WORK CURRENTLY
+ //%gtk|%mac %class %noclassinfo wxMessageDialog, wxDialog
+ 
+ %if %win
  %win %class wxMessageDialog, wxDialog
      wxMessageDialog(wxWindow* parent, const wxString& message, const wxString& caption = "Message box", long style = wxOK | wxCANCEL | wxCENTRE, const wxPoint& pos = wxDefaultPosition)
      int ShowModal()
  %endclass
+ %endif // win
+ 
+ %if %gtk|%mac
+ %class %noclassinfo wxMessageDialog, wxDialog
+     wxMessageDialog(wxWindow* parent, const wxString& message, const wxString& caption = "Message box", long style = wxOK | wxCANCEL | wxCENTRE, const wxPoint& pos = wxDefaultPosition)
+     int ShowModal()
+ %endclass
+ %endif // gtk|mac
  
  %endif wxLUA_USE_wxMessageDialog