[Drdivx-commits] SF.net SVN: drdivx: [936] DrDivX/trunk/drdivx2/src

[<ro...@us...>]

Revision: 936
          http://svn.sourceforge.net/drdivx/?rev=936&view=rev
Author:   robux4
Date:     2006-12-11 08:55:33 -0800 (Mon, 11 Dec 2006)

Log Message:
-----------
avoid setting incorrect value
improve the SetSelectionNotify

Modified Paths:
--------------
    DrDivX/trunk/drdivx2/src/property/IntegerProperty.cpp
    DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.cpp
    DrDivX/trunk/drdivx2/src/wxgui/ProgressDialog.cpp
    DrDivX/trunk/drdivx2/src/wxgui/ProgressDialog.h
    DrDivX/trunk/drdivx2/src/wxgui/ProgressDialog.pjd
    DrDivX/trunk/drdivx2/src/wxgui/WidgetUtility.cpp

Modified: DrDivX/trunk/drdivx2/src/property/IntegerProperty.cpp
===================================================================
--- DrDivX/trunk/drdivx2/src/property/IntegerProperty.cpp	2006-12-08 20:22:49 UTC (rev 935)
+++ DrDivX/trunk/drdivx2/src/property/IntegerProperty.cpp	2006-12-11 16:55:33 UTC (rev 936)
@@ -61,7 +61,7 @@
 		}
 	}
 
-	if (noOverflow == true)
+	if (value.length() != 0 && noOverflow == true)
 		number = a;
 
 	return noOverflow;
@@ -109,7 +109,7 @@
 		}
 	}
 
-	if (noOverflow == true)	
+	if (value.length() != 0 && noOverflow == true)	
 		number = a;
 
 	return noOverflow;

Modified: DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.cpp
===================================================================
--- DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.cpp	2006-12-08 20:22:49 UTC (rev 935)
+++ DrDivX/trunk/drdivx2/src/wxgui/PreferencesDialog.cpp	2006-12-11 16:55:33 UTC (rev 936)
@@ -1351,7 +1351,8 @@
 
 void PreferencesDialog::OnComboboxModVidWidthSelected( wxCommandEvent& event )
 {
-	prefs->SetStringOption(MODULO_VIDEO_WIDTH, string(event.GetString().mb_str(wxConvUTF8)));
+	if (event.GetInt()>=0)
+		prefs->SetStringOption(MODULO_VIDEO_WIDTH, string(event.GetString().mb_str(wxConvUTF8)));
     event.Skip();
 }
 
@@ -1362,7 +1363,8 @@
 
 void PreferencesDialog::OnComboboxModVidHeightSelected( wxCommandEvent& event )
 {
-	prefs->SetStringOption(MODULO_VIDEO_HEIGHT, string(event.GetString().mb_str(wxConvUTF8)));
+	if (event.GetInt()>=0)
+		prefs->SetStringOption(MODULO_VIDEO_HEIGHT, string(event.GetString().mb_str(wxConvUTF8)));
     event.Skip();
 }
 

Modified: DrDivX/trunk/drdivx2/src/wxgui/ProgressDialog.cpp
===================================================================
--- DrDivX/trunk/drdivx2/src/wxgui/ProgressDialog.cpp	2006-12-08 20:22:49 UTC (rev 935)
+++ DrDivX/trunk/drdivx2/src/wxgui/ProgressDialog.cpp	2006-12-11 16:55:33 UTC (rev 936)
@@ -99,10 +99,6 @@
 
     CreateControls();
     SetIcon(GetIconResource(wxT("images/rx.png")));
-    if (GetSizer())
-    {
-        GetSizer()->SetSizeHints(this);
-    }
     Centre();
 ////@end ProgressDialog creation
     return true;
@@ -147,7 +143,7 @@
     wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxHORIZONTAL);
     itemBoxSizer4->Add(itemBoxSizer6, 1, wxGROW, 5);
 
-    progressBar = new wxGauge( itemDialog1, ID_GAUGE1, 100, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL|wxGA_PROGRESSBAR|wxGA_SMOOTH|wxNO_BORDER );
+    progressBar = new wxGauge( itemDialog1, ID_GAUGE1, 100, wxDefaultPosition, wxSize(-1, 20), wxGA_HORIZONTAL|wxGA_PROGRESSBAR|wxGA_SMOOTH|wxNO_BORDER );
     progressBar->SetValue(0);
     itemBoxSizer6->Add(progressBar, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 

Modified: DrDivX/trunk/drdivx2/src/wxgui/ProgressDialog.h
===================================================================
--- DrDivX/trunk/drdivx2/src/wxgui/ProgressDialog.h	2006-12-08 20:22:49 UTC (rev 935)
+++ DrDivX/trunk/drdivx2/src/wxgui/ProgressDialog.h	2006-12-11 16:55:33 UTC (rev 936)
@@ -50,7 +50,7 @@
 #define SYMBOL_PROGRESSDIALOG_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
 #define SYMBOL_PROGRESSDIALOG_TITLE _("Analyzing...")
 #define SYMBOL_PROGRESSDIALOG_IDNAME ID_PROGRESSDIALOG
-#define SYMBOL_PROGRESSDIALOG_SIZE wxSize(300, -1)
+#define SYMBOL_PROGRESSDIALOG_SIZE wxSize(340, 130)
 #define SYMBOL_PROGRESSDIALOG_POSITION wxDefaultPosition
 ////@end control identifiers
 

Modified: DrDivX/trunk/drdivx2/src/wxgui/ProgressDialog.pjd
===================================================================
--- DrDivX/trunk/drdivx2/src/wxgui/ProgressDialog.pjd	2006-12-08 20:22:49 UTC (rev 935)
+++ DrDivX/trunk/drdivx2/src/wxgui/ProgressDialog.pjd	2006-12-11 16:55:33 UTC (rev 936)
@@ -290,11 +290,11 @@
           <bool name="proxy-wxWS_EX_TRANSIENT">0</bool>
           <string name="proxy-Custom styles">""</string>
           <bool name="proxy-wxDIALOG_EX_CONTEXTHELP">0</bool>
-          <bool name="proxy-Fit to content">1</bool>
+          <bool name="proxy-Fit to content">0</bool>
           <long name="proxy-X">-1</long>
           <long name="proxy-Y">-1</long>
-          <long name="proxy-Width">300</long>
-          <long name="proxy-Height">-1</long>
+          <long name="proxy-Width">340</long>
+          <long name="proxy-Height">130</long>
           <string name="proxy-Event sources">""</string>
           <document>
             <string name="title">"wxBoxSizer H"</string>
@@ -518,7 +518,7 @@
                   <long name="proxy-X">-1</long>
                   <long name="proxy-Y">-1</long>
                   <long name="proxy-Width">-1</long>
-                  <long name="proxy-Height">-1</long>
+                  <long name="proxy-Height">20</long>
                   <string name="proxy-AlignH">"Expand"</string>
                   <string name="proxy-AlignV">"Centre"</string>
                   <long name="proxy-Stretch factor">1</long>

Modified: DrDivX/trunk/drdivx2/src/wxgui/WidgetUtility.cpp
===================================================================
--- DrDivX/trunk/drdivx2/src/wxgui/WidgetUtility.cpp	2006-12-08 20:22:49 UTC (rev 935)
+++ DrDivX/trunk/drdivx2/src/wxgui/WidgetUtility.cpp	2006-12-11 16:55:33 UTC (rev 936)
@@ -65,6 +65,8 @@
 		return;
 	evt.SetId(wnd->GetId());
 	evt.SetInt(n);
+	if (n>=0)
+		evt.SetString(wnd->GetString(n));
 
 	::wxPostEvent(wnd,evt);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.